diff improvements

before/after: http://i.imgur.com/dkylcgA.png