Adjust wording, fix typos