Added PlayerStats. Refactored some classes to remove warnings