More work on templates, fixed spelling mistake in mapping