Latest review changes.

* Everything is up to date with the comments.
* Missing tests.