changes to d's client.c and and bit cahnges to server.c