Incomplete text rendering.

With little experience in text rendering its difficult to say whats
going wroing here. Will revisit this at a later stage. for now will
throw this into a branch and move on with other things.
Merge branch 'text'