Improved Makefile, and a bit of housecleaning