some bugfixing...