modified makefile
cleaned up