minor edits to comments and debug messages