Fixed the problems with the makefile