cleanups
Add colorizing of template parameters
Clean up a couple of prints