Effect #7 and bugfixes

Major bugfix in overlay injector.