More template log fixes, and graphing fixes.