Fix typo
Improve messages