Fix some issues
Merge branch 'feature/work_on_models' into develop