Added glyphs, cleaned up

Added glyphs, cleaned up