Pull state reporting changes into 1606_ox branch

Why did you separate reporting of traversals from reporting of other stats?