- Enhance some errors wording
