fix some bugs, better way of showing differences