Fix up templates

This is basically done. I've filed a few github issues in my copy of the repo that we need to address.