* improve stat tracking