template updates; small fixes