Made some changes to the makefile