MAke dependency order saner
Rebuild on changes to makefile
Add debugging info
Move data into explicit named union