tweaks
fixed busted iterator