updated Makefile
some more changes