fixes on models, added deps to setup