Fixed some iteration things