continued bugfixes