misc. changes to Modelio model