continued bugfixing