lots of cleanup.  Reworking templates