Corrected comments and error messages