more work for text rendering

Change-Id: I4c94757de59722b7dfec9e2d0db83fc5734ba942