Some minor improvements to the handshake.

still not functional at this time...