fix typo, improve messages