minor template enhancements