Changed TODO
Reworded some stuff in TODO