added templates and updated some