updated templates
Minor tweaks and edits