Bugfixes and usability improvements