Adding some changes
Fixed the makefile