Some changes and additions in preparation for the new glyph map system.
More changes and fixes in preparation for the new glyph map system.