Amendment template improvements.

you can rebase my template changes into your commit if you like
ups.... :)