more cleanup, UI tweaks