reworked templates so that they are sane (easier to transclude)