Fixing conflict detection of false positives
Numerous additional debug statements, changed addToGroup argument order