Fix comments and ERROR information.