Improve wording, fix typos