minor cleanups in error messages, comments