Cleanup more makefile and some standardization for output. 

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