Fixed one-to-one menu. Added M option to random mode