ELO fixes and other stuff, fixes #100