further Bugfixes