minor changes to templates and models.