lots of UI tweaks, updates