text output changes and minor improvements