Text changes

And other minor edits