fixed up some diffs