various Bugfixes