some Bugfixes