Template Cleaning

This is one of those ultra mundane PR's that simply adds and/or converts template comments to docblocks.  

Also contained in the PR is a fair amount of spacing, indenting, newline tweaks along the way ...

No functional changes that I recall, I tried to keep those in other branches as I found them

Git says this will merge, I'd expect a conflict when other PR's are pulled but ....