fix some more model bugs