Better wording.
Fix several issues.
Add initial integration test.