A lot of UI improvements and server integration