add ToDo improvements