I did some more testing and a few more changes. It should now work like this in 4.934. Hopefully no delays etc. needed anymore.
