Modified some TODOs