Improved Makefile a bit