Changes to diff

Should fit specs now. Still having issues with tests of diff.