fixed some diffs