Correcting some text and error messages