update comments for handshake.