minor fixes to model