added some more text support