Improving stats formatting and adding new stats queries