various
template updates