fixes to iterator
fixes to iterator