+ Cleaned up some output and makefile flags