Beginning of text rendering improvements