bug fixes, changes to UI