Template updates

Adds some tagging and generally cleans up language.
Merge branch 'dev'