More iterator improvements.
Fixed shuffling algorithm.