more bugfixing