Fix a couple of tests (margins have changed, and remove a debug print).
Fix 'cw' at the end of a line.