Extended and cleaned some of the templates.