bug fixes, ui improvements