update a few comments and error messages