updating templates, model fixes