Cleanups, moved TODO's contents to GitHub