bugfixes, ui improvements