Improve messages and fix typos