new models and fixes