Fixed save on onPause and Iterator (so that it now actually iterates. Imagine that!)