Round based cycling, hybrid ELO sorting and fixes