minor tweaks to templates