Add experimental change to fix line mangling
Fix buffer overflows
Ensure that glyph issue was fixed