If Fusion Were That Easy: more Bugfixes

more Bugfixes