Adding in some upgrades
Fixing some drawing issues
Removing glyphing and drawing, as they should be separate projects