usability improvements, bugfixes, refactoring