Two rounds of feedback

We will work together until we reach version 3. Any additional feedback will incur additional fees.