Updates to templates and actual specs.