+ correction to system
+ added N limit
+ attempted to fix Group sort on the bottom of pages