Significantly improved makefile