Refactor differences list. minor other changes.