* Various Bugfixes