Cleanup more makefile and some standardization for output. 

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

I don't know of a better way - it all lines up and make sense currently.  Might want to come up with a formal output system in the future.