minor cleanup
misc template tweaks