Changed Makefile a bit more