re-indent where properly
re-indent.
re-indent
re-indent
add hook for received handshake message