return additions and deletions on diff
some misc cleanups