Some tweaks to the templates
Fixed typos.