fix switched cells in the table of Y_rs equivalences
add additional equivalences for Y_rr