Error messages and comments clarified.