Infinite iterator fixed for infinite loops. TODOs

Strange plot when finishing each iteration, no idea what’s up, must
investigate.