Threads usage cleanup. Still at least one bug to go.
8 files changed