fix some models, add some and do some modifications