more Makefile cleanup and consistency stuff