More Corrections to the templates. All included templates are now tested and functional.