further bugfixes