Final Commit for next workshop Update

Ok, this should be the last commit before the next Workshop-Update.
If I found something, which I still missed, I will commit that too, but
normally I think that this is the final one.

Now waiting for Patchers Buddy-Function ...