bug fixes and UI tweaks