more work in the direction of correct text rendering

It still does not render text correctly (or visible) but at least
according to my debugging skills we are making progress.

Change-Id: I2bff955b7395126770295ba1546e8cb3f70557c7