lots of UI tweaks