Removed outdated comment; Added ToDo-list;