fix up minor bugs and UI changes