raw text output improved