Modified argument passing system to be more reliable and intuitive
Fixed bug in passphrase handshaking where it would fail if party names were not the same