threading fixes
4 files changed