- Added more stat tracking