Updates to templates and such