Fixing up some TODOs, minor commit.