Fixing up the templates and the documentation