bugfixing

some bugfixing