more thread edits
Merge branch 'master' of https://github.com/apfundst/SWE-3613-Waggle