A few more refinements, now no failures at 1000 iterations