added templates
cosmetics and typos