Fixed daa, ei, di [now these ops pass the tests]