much improved Makefile