various updates to templates