some bug fixes and UI updates