resolve compiling errors
update iterator files