Cleaning up the thread management to ensure we are always responsive. Updates are still not working, but that's next on the list.