more bugfixing done