bugfixing in progres ...