improved and extended benchmarking
Merge branch 'master' into ps
stats-dumping facility for erdi