Added a few more stats
Cleaned up code and added some more functions for stats