bunch of changes
including the CoverageStatsMapper
some minor changes