Comments and minor updates.
Add new tests.