Improved stats updating. Still has issue with first round