some more bugfixing