Fixed some ToDo notes