Add patience switch to settings for diff.
Merge and clean up a little