minor bugfixes
merging templates
merge pt 2.