Rearrange some stuff, fix ThreadUpdater.disconnect