some more bugfixing...
some more bugfixing