Updating the ToDo's
Refactoring some crossrefrences
Updating a comment