add the text mode; clean up the charset test