Updating develop to match master

Some text changes.