Mostly improved Makefile