Debugged+ repaired makefile