more updates to templates