minor tweaks to template