fixed some stuff int the makefile
moved changes to the other makefile