Fixes some CIGAR codes and comments some counters