Fixed errors, makefile