Thread watcher

A few minor changes to make the thread watcher prettier.

I can't figure out how to properly test it, but the code looks fine and runs in the console.