Work on trident and SAMVIS, fix an ugly bug in the mapping statistics calculation
Work on trident and SAMVIS, fix an ugly bug in the mapping statistics calculation