Modified Makefile some more