many updates to templates