bug fixes, ui changes