Adds comments.
Updates tests.