TextItem

Some fixes for TextItem.