diff --git a/reaction/cgame/cg_draw.c b/reaction/cgame/cg_draw.c
index 8a9a28d6..ea4b770e 100644
--- a/reaction/cgame/cg_draw.c
+++ b/reaction/cgame/cg_draw.c
@@ -5,6 +5,9 @@
 //-----------------------------------------------------------------------------
 //
 // $Log$
+// Revision 1.39  2002/05/01 21:14:59  jbravo
+// Misc fixes
+//
 // Revision 1.38  2002/05/01 03:27:17  niceass
 // centerprint fix + prettier
 //
@@ -2415,6 +2418,10 @@ static void CG_DrawCrosshairNames( void ) {
 	if ( cg.renderingThirdPerson ) {
 		return;
 	}
+// JBravo: no names for zcam users.
+	if (cg.snap->ps.stats[STAT_RQ3] & RQ3_ZCAM) {
+		return;
+	}
 
 	// scan the known entities to see if the crosshair is sighted on one
 	CG_ScanForCrosshairEntity();
@@ -2671,7 +2678,7 @@ static qboolean CG_DrawFollow( void ) {
 		if (team == TEAM_RED) {
 			Com_sprintf (combinedName, sizeof(combinedName), "%sFollowing%s %s%s/%s%s", S_COLOR_RED,
 				S_COLOR_WHITE, cgs.clientinfo[cg.snap->ps.clientNum].name, S_COLOR_RED,
-				S_COLOR_MAGENTA, cg_RQ3_team2name.string);
+				S_COLOR_MAGENTA, cg_RQ3_team1name.string);
 		} else {
 			Com_sprintf (combinedName, sizeof(combinedName), "%sFollowing%s %s%s/%s%s", S_COLOR_RED,
 				S_COLOR_WHITE, cgs.clientinfo[cg.snap->ps.clientNum].name, S_COLOR_RED,
diff --git a/reaction/game/bg_pmove.c b/reaction/game/bg_pmove.c
index dfada128..cd1e813c 100644
--- a/reaction/game/bg_pmove.c
+++ b/reaction/game/bg_pmove.c
@@ -5,6 +5,9 @@
 //-----------------------------------------------------------------------------
 //
 // $Log$
+// Revision 1.69  2002/05/01 21:14:59  jbravo
+// Misc fixes
+//
 // Revision 1.68  2002/04/26 05:29:38  niceass
 // PHYSICS, Take 2
 //
@@ -1698,15 +1701,15 @@ static void PM_FinishWeaponChange( void ) {
 	savedWeap = pm->ps->weapon;
 
 	if ( weapon < WP_NONE || weapon >= WP_NUM_WEAPONS ) {
-		Com_Printf("BANDAGEBUG: (1) weapon is %d and cmd.weapon is %d. Reverting to previous weapon\n", pm->ps->weapon,
-				weapon);
+//		Com_Printf("BANDAGEBUG: (1) weapon is %d and cmd.weapon is %d. Reverting to previous weapon\n", pm->ps->weapon,
+//				weapon);
 		weapon = savedWeap;
 //		weapon = WP_NONE;
 	}
 
 	if ( !( pm->ps->stats[STAT_WEAPONS] & ( 1 << weapon ) ) ) {
-		Com_Printf("BANDAGEBUG: (2) weapon is %d and cmd.weapon is %d. Reverting to previous weapon\n", pm->ps->weapon,
-				weapon);
+//		Com_Printf("BANDAGEBUG: (2) weapon is %d and cmd.weapon is %d. Reverting to previous weapon\n", pm->ps->weapon,
+//				weapon);
 		weapon = savedWeap;
 //		weapon = WP_NONE;
 	}
diff --git a/reaction/game/zcam.c b/reaction/game/zcam.c
index ef3f464d..91be71fb 100644
--- a/reaction/game/zcam.c
+++ b/reaction/game/zcam.c
@@ -5,6 +5,9 @@
 //-----------------------------------------------------------------------------
 //
 // $Log$
+// Revision 1.11  2002/05/01 21:14:59  jbravo
+// Misc fixes
+//
 // Revision 1.10  2002/03/31 03:31:24  jbravo
 // Compiler warning cleanups
 //
@@ -237,17 +240,17 @@ static int NumPlayers (void)
   for (i = 0; i < level.maxclients; i++) 
     {
 // JBravo: zcam team fixes
-      if (g_gametype.integer == GT_TEAMPLAY) {
+/*      if (g_gametype.integer == GT_TEAMPLAY) {
 	if (level.clients[i].pers.connected == CON_CONNECTED 
 		&& level.clients[i].sess.savedTeam != TEAM_SPECTATOR) {
 	  count ++;
 	}
-      } else {
+      } else { */
 	if (level.clients[i].pers.connected == CON_CONNECTED 
 		&& level.clients[i].sess.sessionTeam != TEAM_SPECTATOR) {
 	  count ++;
 	}
-      }
+//      }
     }
   return count;
 }