small template improvements