Minor (comments and a user-facing message)