updated corpus iterator
fixed conflicts