Enhancements to Ediff