minor fixes/iteration