Fixed the stat tracking (should test with players before commiting)