untested text support, bug fixes