Bugfix for Compatability between plugin alterations

After new feedback it became clear, that the new features did not work well together. Because of that, I had to fix some parts of the plugin. Now all parts should work fine together. If there are errors and oddities, I might have overlooked, you can tell me. I will try my very best to solve this issues.