-Changed some values
-Circulation is now non-additive (only maximizes)
-Threshold size is larger than before for elements
Merge branch 'grouping'