further template tweaks