Bugfixes and minor usability improvements.