Updated some TODOs