minor template tweaks