Minor improvements
Updated the ToDo