UI improvements, model improvements
misc changes