minor template improvements