Improve style, implement 'next' for corr games. TODO: rematch logic