Model improvements
Fixes