Reordered some things in TimeWarpEventDispatcher

as well as some other minor changes.