Changed a few Makefiles & Fixed 3 bugs.