0.6c: bunch of minor improvements and bugfixes