resolve x and pi

modify 9 glyphs, add some glyphs