- adapted both Iterators
- small fixes