some models and fixes