comments and slight changes to server.c and client.c