endpoint stats extended
fixes and extensions
Merge branch 'modulo'