even more bugfixing