Cleaning up the base glyphing code, adding some functionality