Now with more working stats
bug fixes