fixed problems with models and slight improvement over some of them