Fixed Some Iteration Stuff