rm unused (and un-pickleable) iterator
fix variable name
Merge branch 'master' into aaspchall