some bugfixing done