minor changes to client and server - q01