Add 'wid' to stats
Fix thread patch to be debugger friendly
Flake8 fixes
Merge pull request #606 from scottkmaxwell/include-wid-in-stats

Include wid in stats