replace lots of iterators with range-based
bugfix in ami augmenter
added a phi branch for the trk colleciton
bugfix