fix lots of model...