Updates to client and server guide.