more template tweaks