Added many more mappings, summary stats output in analysis.txt