Added peek(), has_next() to iterator.

Still some ordering problems.