fix highlight for diffs, fix statusline