diff --git a/nq/include/client.h b/nq/include/client.h
index ff0c203d8..b6e4a85bc 100644
--- a/nq/include/client.h
+++ b/nq/include/client.h
@@ -133,7 +133,7 @@ extern client_static_t	cls;
 /*
   the client_state_t structure is wiped completely at every server signon
 */
-typedef struct {
+typedef struct client_state_s {
 	qboolean    loading;
 
 	int         movemessages;	// Since connecting to this server throw out
@@ -144,7 +144,7 @@ typedef struct {
 // information for local display
 	int         stats[MAX_CL_STATS];	// Health, etc
 	float       item_gettime[32];	// cl.time of aquiring item, for blinking
-	float       faceanimtime;	// Use anim frame if cl.time < this
+	float       faceanimtime;			// Use anim frame if cl.time < this
 
 	cshift_t    cshifts[NUM_CSHIFTS];	// Color shifts for damage, powerups
 	cshift_t    prev_cshifts[NUM_CSHIFTS];	// and content types
@@ -170,13 +170,13 @@ typedef struct {
 	double      laststop;
 
 	qboolean    paused;			// Sent over by server
-	int         onground;
+	int         onground;		// -1 when in air
 	float       viewheight;
 	float       crouch;			// Local amount for smoothing stepups
 	qboolean    inwater;
 
 	int         intermission;	// Don't change view angle, full screen, etc
-	int         completed_time;	// Latched at intermission start
+	int         completed_time;	// Latched from time at intermission start
 
 	double      mtime[2];		// The timestamp of last two messages
 	double      time;			// Clients view of time, should be between
@@ -185,6 +185,7 @@ typedef struct {
 	double      oldtime;		// Previous cl.time, time-oldtime is used
 								// to decay light values and smooth step ups
 
+	double      last_ping_request;	// while showing scoreboard
 	double      last_servermessage;	// (realtime) for net trouble icon
 
 /* information that is static for the entire time connected to a server */
diff --git a/qw/include/client.h b/qw/include/client.h
index c9481f209..4a23f4c29 100644
--- a/qw/include/client.h
+++ b/qw/include/client.h
@@ -171,7 +171,7 @@ extern client_static_t	cls;
 /*
   the client_state_t structure is wiped completely at every server signon
 */
-typedef struct {
+typedef struct client_state_s {
 	qboolean    loading;
 
 	int         movemessages;	// Since connecting to this server throw out
@@ -183,7 +183,7 @@ typedef struct {
 	int         prev_sequence;
 
 // information for local display
-	int         stats[MAX_CL_STATS];	// health, etc
+	int         stats[MAX_CL_STATS];	// Health, etc
 	float       item_gettime[32];	// cl.time of aquiring item, for blinking
 	float       faceanimtime;			// Use anim frame if cl.time < this
 
@@ -213,10 +213,11 @@ typedef struct {
 	qboolean    paused;			// Sent over by server
 	int         onground;		// -1 when in air
 	float       viewheight;
-	float       crouch;			// local amount for smoothing stepups
+	float       crouch;			// Local amount for smoothing stepups
+	qboolean    inwater;
 
-	int         intermission;	// don't change view angle, full screen, etc
-	int         completed_time;	// latched from time at intermission start
+	int         intermission;	// Don't change view angle, full screen, etc
+	int         completed_time;	// Latched from time at intermission start
 
 	int         servercount;	// server identification for prespawns
 	struct info_s *serverinfo;
@@ -226,7 +227,7 @@ typedef struct {
 								// can't render a frame yet
 
 	double      last_ping_request;	// while showing scoreboard
-	double      last_servermessage;
+	double      last_servermessage;	// (realtime) for net trouble icon
 
 /* information that is static for the entire time connected to a server */
 
@@ -244,7 +245,7 @@ typedef struct {
 	char        levelname[40];	// for display on solo scoreboard
 	int         spectator;
 	int         playernum;
-	int         viewentity;
+	int         viewentity;		// cl_entitites[cl.viewentity] = player
 	unsigned    protocol;
 	float       stdver;
 	int         gametype;
@@ -260,7 +261,7 @@ typedef struct {
 
 // refresh related state
 	struct model_s *worldmodel;	// cl_entitites[0].model
-	int         num_entities;	// stored bottom up in cl_entities array
+	int         num_entities;	// held in cl_entities array
 	entity_t    viewent;		// the weapon model
 
 	int         cdtrack;		// cd audio