Updated edits to work with new Diff algorithm
Removed path grouping code
Fixed simple warnings and hid name shadowing warning