Major update with lots of error corrections and glyph cleanup.