Extraneous junk in Makefile
A bunch of consistency fixes