some UI testing, and accompanying bugfixes