Added expansion glyphs, fixed a few related bugs