Iterate! And minor mods