merge Kens changes
Better diff mode