tweaks to templates