clean up display of diff a bit
merge changes