model changes, some UI updates