Some comment updates.
Add support for invariants.