Template audit and cleanup.  Fixed up a lot of templates to make them consistent.  Tweaked a bunch of little details.