Cleanup more makefile and some standardization for output. 

This is the start of the process to standardized output and methods.  

If the small spelling mistakes are fixed, I'm fine with merging this.