Updated the threadly version, and did a couple of the simpler TODO notes