Fixed bugs, added text support.