some changes to diffing and everyday vimming
bunch of improvements