Pro++, Word-wrapping diffs, and more

cursor
~changed 6
✓fixed 1