updated and fixed makefile