diff --git a/reaction/cgame/cg_main.c b/reaction/cgame/cg_main.c
index a9e0acdf..fac9a180 100644
--- a/reaction/cgame/cg_main.c
+++ b/reaction/cgame/cg_main.c
@@ -5,6 +5,9 @@
 //-----------------------------------------------------------------------------
 //
 // $Log$
+// Revision 1.77  2002/06/09 18:58:40  makro
+// no message
+//
 // Revision 1.76  2002/06/09 05:14:40  niceass
 // pressure change
 //
@@ -527,10 +530,11 @@ static cvarTable_t cvarTable[] = { // bk001129
 	{ &cg_RQ3_ssgColorB, "cg_RQ3_ssgColorB", "0.0", CVAR_ARCHIVE },
 	{ &cg_RQ3_ssgColorA, "cg_RQ3_ssgColorA", "0.75", CVAR_ARCHIVE },
 // JBravo: cvars for regular crosshairs and their colors
-	{ &cg_RQ3_crosshairColorR, "cg_RQ3_crosshairColorR", "0.0", CVAR_ARCHIVE },
+// Makro - changed default color to white; it was 0/1/0/.75 before
+	{ &cg_RQ3_crosshairColorR, "cg_RQ3_crosshairColorR", "1.0", CVAR_ARCHIVE },
 	{ &cg_RQ3_crosshairColorG, "cg_RQ3_crosshairColorG", "1.0", CVAR_ARCHIVE },
-	{ &cg_RQ3_crosshairColorB, "cg_RQ3_crosshairColorB", "0.0", CVAR_ARCHIVE },
-	{ &cg_RQ3_crosshairColorA, "cg_RQ3_crosshairColorA", "0.75", CVAR_ARCHIVE },
+	{ &cg_RQ3_crosshairColorB, "cg_RQ3_crosshairColorB", "1.0", CVAR_ARCHIVE },
+	{ &cg_RQ3_crosshairColorA, "cg_RQ3_crosshairColorA", "1.0", CVAR_ARCHIVE },
 	{ &cg_RQ3_tkokAutoPopup, "cg_RQ3_tkokAutoPopup", "0", CVAR_ARCHIVE },
 	{ &cg_RQ3_impactEffects, "cg_RQ3_impactEffects", "1", CVAR_ARCHIVE },
 	{ &cg_RQ3_laserAssist, "cg_RQ3_laserAssist", "0", CVAR_ARCHIVE },
diff --git a/reaction/cgame/cg_players.c b/reaction/cgame/cg_players.c
index d92524cf..a04ace25 100644
--- a/reaction/cgame/cg_players.c
+++ b/reaction/cgame/cg_players.c
@@ -5,6 +5,9 @@
 //-----------------------------------------------------------------------------
 //
 // $Log$
+// Revision 1.30  2002/06/09 18:58:40  makro
+// no message
+//
 // Revision 1.29  2002/06/01 04:20:09  niceass
 // knife throw active animation bug fixed
 //
@@ -935,7 +938,8 @@ void CG_UpdateTeamVars() {
 	clientInfo_t	*ci;
 	int		i;
 	int		Reds, Blues, Spectators;
-	char v[2];
+	//Makro - changed from 2 to 4; not really needed, but it's safer
+	char v[4];
 
 	Reds = Blues = Spectators = 0;
 
diff --git a/reaction/cgame/cgame.plg b/reaction/cgame/cgame.plg
index 1c4cd817..d0c72fee 100644
--- a/reaction/cgame/cgame.plg
+++ b/reaction/cgame/cgame.plg
@@ -6,14 +6,13 @@
 --------------------Configuration: cgame - Win32 Release--------------------
 </h3>
 <h3>Command Lines</h3>
-Creating temporary file "D:\DOCUME~1\Andrei\LOCALS~1\Temp\RSP1C1.tmp" with contents
+Creating temporary file "D:\DOCUME~1\Andrei\LOCALS~1\Temp\RSP1CC.tmp" with contents
 [
 /nologo /G6 /ML /W4 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /Fp"Release/cgame.pch" /YX /Fo"Release/" /Fd"Release/" /FD /c 
 "C:\Games\Quake3\rq3source\reaction\cgame\cg_info.c"
-"C:\Games\Quake3\rq3source\reaction\cgame\cg_main.c"
 ]
-Creating command line "cl.exe @D:\DOCUME~1\Andrei\LOCALS~1\Temp\RSP1C1.tmp" 
-Creating temporary file "D:\DOCUME~1\Andrei\LOCALS~1\Temp\RSP1C2.tmp" with contents
+Creating command line "cl.exe @D:\DOCUME~1\Andrei\LOCALS~1\Temp\RSP1CC.tmp" 
+Creating temporary file "D:\DOCUME~1\Andrei\LOCALS~1\Temp\RSP1CD.tmp" with contents
 [
 /nologo /base:"0x30000000" /subsystem:windows /dll /incremental:no /pdb:"Release/cgamex86.pdb" /map:"Release/cgamex86.map" /machine:I386 /def:".\cgame.def" /out:"../Release/cgamex86.dll" /implib:"Release/cgamex86.lib" 
 .\Release\bg_misc.obj
@@ -42,18 +41,17 @@ Creating temporary file "D:\DOCUME~1\Andrei\LOCALS~1\Temp\RSP1C2.tmp" with conte
 .\Release\q_shared.obj
 .\Release\ui_shared.obj
 ]
-Creating command line "link.exe @D:\DOCUME~1\Andrei\LOCALS~1\Temp\RSP1C2.tmp"
+Creating command line "link.exe @D:\DOCUME~1\Andrei\LOCALS~1\Temp\RSP1CD.tmp"
 <h3>Output Window</h3>
 Compiling...
 cg_info.c
-C:\Games\Quake3\rq3source\reaction\cgame\cg_info.c(226) : error C2065: 'skipdetail' : undeclared identifier
-cg_main.c
-Error executing cl.exe.
+Linking...
+   Creating library Release/cgamex86.lib and object Release/cgamex86.exp
 
 
 
 <h3>Results</h3>
-cgamex86.dll - 1 error(s), 0 warning(s)
+cgamex86.dll - 0 error(s), 0 warning(s)
 </pre>
 </body>
 </html>
diff --git a/reaction/game/g_cmds.c b/reaction/game/g_cmds.c
index 79f940a7..f8d71e46 100644
--- a/reaction/game/g_cmds.c
+++ b/reaction/game/g_cmds.c
@@ -5,6 +5,9 @@
 //-----------------------------------------------------------------------------
 //
 // $Log$
+// Revision 1.122  2002/06/09 18:58:00  makro
+// no message
+//
 // Revision 1.121  2002/06/07 19:07:08  slicer
 // removed cvars for teamXready, replaced by level.teamXready
 //
@@ -1071,10 +1074,17 @@ void Cmd_Team_f (gentity_t *ent) {
 	int	oldTeam;
 	char	s[MAX_TOKEN_CHARS];
 
+	//Makro - moved here
+	if (g_gametype == GT_TEAMPLAY) {
+		oldTeam = ent->client->sess.savedTeam;
+	} else {
+		oldTeam = ent->client->sess.sessionTeam;
+	}
+
 	if (trap_Argc() != 2) {
 // JBravo: lets keep the teamnames right.
 		if (g_gametype.integer == GT_TEAMPLAY) {
-			oldTeam = ent->client->sess.savedTeam;
+			//oldTeam = ent->client->sess.savedTeam;
 			switch (oldTeam) {
 			case TEAM_RED:
 				trap_SendServerCommand( ent-g_entities, va("print \"You are a member of %s\n\"", g_RQ3_team1name.string));
@@ -1088,7 +1098,7 @@ void Cmd_Team_f (gentity_t *ent) {
 				break;
 			}
 		} else {
-			oldTeam = ent->client->sess.sessionTeam;
+			//oldTeam = ent->client->sess.sessionTeam;
 			switch (oldTeam) {
 			case TEAM_BLUE:
 				trap_SendServerCommand (ent-g_entities, "print \"Blue team\n\"");