and some more bugfixing