Added some stats, refactored some stuff