slight template improvements