minor fixes and updated ToDo