ELO sorting changes and hook improvements