Makefile: clean up the mess; fixes