models fixed and they almost work with api