Patch Cairo
- writing to streams
- build
- refactoring text-handling, constants, names, and other cleanups