fix a bug or two... client-client, server-server work