Various changes and rewordings