bugfixes
Model constraints