template updates and fixes