Merge "Fix tons of bugs and add new text rendering support."