Added M and , to char_map. Correction of 0