fix models and and some tmpl