bug fixes and UI updates