Complete fix for
https://developer.riotgames.com/discussion/riot-games-api/show/LNm1GLPU
and a few new features