Some formatting and explanatory changes to the client/server