some fixes
more model changes