fix glyph logic
clean up package