Todos and clarifying comments