small changes to client