Fixes, and some of the example runs in section 2 testable