Add documentation.
Add TODO from code review