Implemented last step of the iterator and fixed comments.