minor fixes
minor fixes
handshake fixes
host fixed