Fixed Some Iterators and Inputs and Comparisons.

Work may be needed.