moving things around a bit; adding some new stats