Add some comments, and a TODO (warning).