- fixed: now use STL iterators to find elements (rather than a count(), operator[] sequence)
- fixed: header is now commented