Makefile touchup

and kinda maybe some other crap