A few template fixes

Thats all I have to say about that ...

OK it was just moderation, but I plopped in a bunch of mundane template spacing, formatting, docblocks, etc as well.