Many many Bugfixes