- fix missing model "classname"
- some fix