aug28, minor updates to templates