Small bug fixes and futher cleanup of switch to ELO ranking