nit
templates and fix models
remove .swp