Fix and improve move choice with learning