Templates in progress on submissions.

Includes a colourful variety of other miscellaneous fixes.