diff --git a/source/client.h b/source/client.h
index 6a60a1b..54f8703 100644
--- a/source/client.h
+++ b/source/client.h
@@ -38,7 +38,7 @@ typedef struct
 	char    name[MAX_SCOREBOARDNAME];
 	float   entertime;
 	int32_t         frags;
-	int32_t         colors;                 // two 4 bit fields
+	int32_t         colors;                 // 2x4 bit
 	byte    translations[VID_GRADES * 256];
 } scoreboard_t;
 
diff --git a/source/cvar.h b/source/cvar.h
index b981fc1..9a33e71 100644
--- a/source/cvar.h
+++ b/source/cvar.h
@@ -28,7 +28,7 @@ cvar_t variables are used to hold scalar or string variables that can
 be changed or displayed at the console or prog code as well as accessed
 directly in C code.
 
-it is sufficient to initialize a cvar_t with just the first two fields,
+it is sufficient to initialize a cvar_t with just the first two members,
 or you can add a ,true flag for variables that you want saved to the
 configuration file when the game is quit:
 
diff --git a/source/gl_refrag.c b/source/gl_refrag.c
index 3a7caac..d5dd9e9 100644
--- a/source/gl_refrag.c
+++ b/source/gl_refrag.c
@@ -34,7 +34,7 @@ mnode_t *r_pefragtopnode;
                                         ENTITY FRAGMENT FUNCTIONS
 
 ericw -- GLQuake only uses efrags for static entities, and they're never
-removed, so I trimmed out unused functionality and fields in efrag_t.
+removed, so I trimmed out unused functionality and stuff in efrag_t.
 
 Now, efrags are just a linked list for each leaf of the static
 entities that touch that leaf. The efrags are hunk-allocated so there is no
diff --git a/source/glquake.h b/source/glquake.h
index c42b0f1..d3849d9 100644
--- a/source/glquake.h
+++ b/source/glquake.h
@@ -60,10 +60,10 @@ typedef enum
 // !!! if this is changed, it must be changed in d_ifacea.h too !!!
 typedef struct particle_s
 {
-// driver-usable fields
+	// driver-usable
 	vec3_t          org;
 	float           color;
-// drivers never touch the following fields
+	// drivers never touch the following
 	struct particle_s       *next;
 	vec3_t          vel;
 	float           ramp;
diff --git a/source/net_main.c b/source/net_main.c
index b231f16..72f928d 100644
--- a/source/net_main.c
+++ b/source/net_main.c
@@ -82,7 +82,7 @@ double SetNetTime(void)
 NET_NewQSocket
 
 Called by drivers when a new communications endpoint is required
-The sequence and buffer fields will be filled in properly
+The sequence and buffer members will be filled in properly
 ===================
 */
 qsocket_t *NET_NewQSocket(void)
diff --git a/source/pr_comp.h b/source/pr_comp.h
index 9b54897..a914235 100644
--- a/source/pr_comp.h
+++ b/source/pr_comp.h
@@ -170,6 +170,7 @@ enum
 	ED_noise1,
 	ED_noise2,
 	ED_noise3,
+	ED_SYSTEM_END,
 };
 
 #define DEF_SAVEGLOBAL (1 << 15)
diff --git a/source/pr_edict.c b/source/pr_edict.c
index dc0e6d9..f9c9cfc 100644
--- a/source/pr_edict.c
+++ b/source/pr_edict.c
@@ -588,9 +588,6 @@ static string_t ED_NewString(const char *string)
 /*
 =============
 ED_ParseEval
-
-Can parse either fields or globals
-returns false if error
 =============
 */
 bool ED_ParseEpair(void *base, ddef_t *key, const char *s)
@@ -648,7 +645,7 @@ bool ED_ParseEpair(void *base, ddef_t *key, const char *s)
 		def = ED_FindField(s);
 		if(!def)
 		{
-			//johnfitz -- HACK -- suppress error becuase fog/sky fields might not be mentioned in defs.qc
+			//johnfitz -- HACK -- suppress error becuase fog/sky might not be mentioned in defs.qc
 			if(strncmp(s, "sky", 3) && strcmp(s, "fog"))
 				Con_DPrintf("Can't find field %s\n", s);
 			return false;
@@ -751,7 +748,7 @@ const char *ED_ParseEdict(const char *data, edict_t *ent)
 		key = ED_FindField(keyname);
 		if(!key)
 		{
-			//johnfitz -- HACK -- suppress error becuase fog/sky/alpha fields might not be mentioned in defs.qc
+			//johnfitz -- HACK -- suppress error becuase fog/sky/alpha might not be mentioned in defs.qc
 			if(strncmp(keyname, "sky", 3) && strcmp(keyname, "fog") && strcmp(keyname, "alpha"))
 				Con_DPrintf("\"%s\" is not a field\n", keyname);  //johnfitz -- was Con_Printf
 			continue;
diff --git a/source/pr_load.c b/source/pr_load.c
index 1912ff6..20872f0 100644
--- a/source/pr_load.c
+++ b/source/pr_load.c
@@ -80,6 +80,9 @@ static void PR_LoadProgHeader(byte const *data)
 
 	if(progs.numglobals < GBL_SYSTEM_END)
 		Host_Error("PR_LoadProgHeader: not enough globals\n");
+
+	if(progs.entityfields < ED_SYSTEM_END)
+		Host_Error("PR_LoadProgHeader: not enough entity fields\n");
 }
 
 static void PR_LoadFunctions(byte const *data)
diff --git a/source/sv_phys.c b/source/sv_phys.c
index ba450d3..3e1aa44 100644
--- a/source/sv_phys.c
+++ b/source/sv_phys.c
@@ -26,7 +26,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 /*
 
 
-pushmove objects do not obey gravity, and do not interact with each other or trigger fields, but block normal movement and push normal objects when they move.
+pushmove objects do not obey gravity, and do not interact with each other or trigger, but block normal movement and push normal objects when they move.
 
 onground is set for toss objects when they come to a complete rest.  it is set for steping or walking objects
 
diff --git a/source/sv_user.c b/source/sv_user.c
index 2ee222a..58013c6 100644
--- a/source/sv_user.c
+++ b/source/sv_user.c
@@ -375,8 +375,8 @@ void SV_AirMove(void)
 ===================
 SV_ClientThink
 
-the move fields specify an intended velocity in pix/sec
-the angle fields specify an exact angular motion in degrees
+moves specify an intended velocity in pix/sec
+angles specify an exact angular motion in degrees
 ===================
 */
 void SV_ClientThink(void)