before big refactor
Statistics improved a great deal!

Wow! changes everywhere! To do: more statistics!