a bunch of thread edits