more templating changes