updated templates, fixed typos