Organizing and updating TODO list, as well as fixing two mistakes in documentation.