model fixes
Merge pull request #224 from will123195/3.0

model fixes