makefile
Incorporated some changes