comments, CANONICAL_CHR used instead of "x"
Util.Cache created and now used instead of MeasureCache