corrected some templates- end of work