general templating updates