Changes file iter and to iterator.

Also changes havemore to hasNext.