minor additions to client.c and server.c