Better Update Threading

Made Update and Ticker wait for each other, but stay on the same
threads.
conflicts opgelost