Add further comments and todos.