small edits to thread-first, some from Max