fixed adding teams to model issue
made some other changes