bug fixes and UI improvements.