Improve diff by adding more context, better handling of running header.