Lots of code cleanup.  All text is now drawn by the text engine.