updates

- iterator moved
- bugfix