small tweaks to templated