Improvements to stats