Add and improve comments, add a TODO.