diff --git a/src/game/g_ai.c b/src/game/g_ai.c
index c7554714..85960d57 100644
--- a/src/game/g_ai.c
+++ b/src/game/g_ai.c
@@ -751,15 +751,9 @@ M_CheckAttack(edict_t *self)
 		VectorCopy(self->enemy->s.origin, spot2);
 		spot2[2] += self->enemy->viewheight;
 
-		tr = gi.trace(
-				spot1,
-				NULL,
-				NULL,
-				spot2,
-				self,
+		tr = gi.trace(spot1, NULL, NULL, spot2, self,
 				CONTENTS_SOLID | CONTENTS_MONSTER | CONTENTS_SLIME |
-				CONTENTS_LAVA |
-				CONTENTS_WINDOW);
+				CONTENTS_LAVA | CONTENTS_WINDOW);
 
 		/* do we have a clear shot? */
 		if (tr.ent != self->enemy)
diff --git a/src/game/g_func.c b/src/game/g_func.c
index 048e3716..a744f3ec 100644
--- a/src/game/g_func.c
+++ b/src/game/g_func.c
@@ -1378,12 +1378,9 @@ door_go_up(edict_t *self, edict_t *activator)
 	{
 		if (self->moveinfo.sound_start)
 		{
-			gi.sound(self,
-					CHAN_NO_PHS_ADD + CHAN_VOICE,
-					self->moveinfo.sound_start,
-					1,
-					ATTN_STATIC,
-					0);
+			gi.sound(self, CHAN_NO_PHS_ADD + CHAN_VOICE,
+					self->moveinfo.sound_start, 1,
+					ATTN_STATIC, 0);
 		}
 
 		self->s.sound = self->moveinfo.sound_middle;
diff --git a/src/game/g_misc.c b/src/game/g_misc.c
index 8050caa6..38db558a 100644
--- a/src/game/g_misc.c
+++ b/src/game/g_misc.c
@@ -1732,7 +1732,8 @@ SP_misc_deadsoldier(edict_t *ent)
 	}
      
 	if (deathmatch->value)
-	{   /* auto-remove for deathmatch */
+	{   
+		/* auto-remove for deathmatch */
 		G_FreeEdict(ent);
 		return;
 	}
@@ -1849,12 +1850,7 @@ SP_misc_viper(edict_t *ent)
  */
 void
 SP_misc_bigviper(edict_t *ent)
-{  
-	if (!ent)
-	{
-		return;
-	}
-     
+{
 	ent->movetype = MOVETYPE_NONE;
 	ent->solid = SOLID_BBOX;
 	VectorSet(ent->mins, -176, -120, -24);
diff --git a/src/game/player/client.c b/src/game/player/client.c
index 2ab14630..28ce189a 100644
--- a/src/game/player/client.c
+++ b/src/game/player/client.c
@@ -70,7 +70,7 @@ SP_FixCoopSpots(edict_t *self)
 
 		VectorSubtract(self->s.origin, spot->s.origin, d);
 
-		if (VectorLength(d) < 384)
+		if (VectorLength(d) < 550)
 		{
 			if ((!self->targetname) || (Q_stricmp(self->targetname, spot->targetname) != 0))
 			{
@@ -128,6 +128,150 @@ SP_CreateCoopSpots(edict_t *self)
 	}
 }
 
+/*
+ * Some maps have no unnamed (e.g. generic)
+ * info_player_start. This is no problem in
+ * normal gameplay, but if the map is loaded
+ * via console there is a huge chance that
+ * the player will spawn in the wrong point.
+ * Therefor create an unnamed info_player_start
+ * at the correct point.
+ */
+void
+SP_CreateUnnamedSpawn(edict_t *self)
+{
+	edict_t *spot;
+
+	if (!self)
+	{
+		return;
+	}
+
+	/* If there is a spawnpoint to use, we
+	   don't need any unnamed spawnpoints */
+	if (Q_stricmp(game.spawnpoint, "") != 0)
+	{
+		return;
+	}
+
+	/* mine1 */
+    if (Q_stricmp(level.mapname, "mine1") == 0)
+	{
+		if (Q_stricmp(self->targetname, "mintro") == 0)
+		{
+			spot = G_Spawn();
+			spot = self;
+			spot->targetname = NULL;
+
+			return;
+		}
+	} 
+
+	/* mine2 */
+    if (Q_stricmp(level.mapname, "mine2") == 0)
+	{
+		if (Q_stricmp(self->targetname, "mine1") == 0)
+		{
+			spot = G_Spawn();
+			spot = self;
+			spot->targetname = NULL;
+
+			return;
+		}
+	}
+
+	/* mine3 */
+    if (Q_stricmp(level.mapname, "mine3") == 0)
+	{
+		if (Q_stricmp(self->targetname, "mine2a") == 0)
+		{
+			spot = G_Spawn();
+			spot = self;
+			spot->targetname = NULL;
+
+			return;
+		}
+	}  
+
+	/* mine4 */
+    if (Q_stricmp(level.mapname, "mine4") == 0)
+	{
+		if (Q_stricmp(self->targetname, "mine3") == 0)
+		{
+			spot = G_Spawn();
+			spot = self;
+			spot->targetname = NULL;
+
+			return;
+		}
+	}
+
+ 	/* power2 */
+    if (Q_stricmp(level.mapname, "power2") == 0)
+	{
+		if (Q_stricmp(self->targetname, "power1") == 0)
+		{
+			spot = G_Spawn();
+			spot = self;
+			spot->targetname = NULL;
+
+			return;
+		}
+	} 
+	
+	/* waste1 */
+    if (Q_stricmp(level.mapname, "waste1") == 0)
+	{
+		if (Q_stricmp(self->targetname, "power2") == 0)
+		{
+			spot = G_Spawn();
+			spot = self;
+			spot->targetname = NULL;
+
+			return;
+		}
+	} 
+	
+	/* waste2 */
+    if (Q_stricmp(level.mapname, "waste2") == 0)
+	{
+		if (Q_stricmp(self->targetname, "waste1") == 0)
+		{
+			spot = G_Spawn();
+			spot = self;
+			spot->targetname = NULL;
+
+			return;
+		}
+	} 
+	
+	/* waste3 */
+    if (Q_stricmp(level.mapname, "waste3") == 0)
+	{
+		if (Q_stricmp(self->targetname, "waste2") == 0)
+		{
+			spot = G_Spawn();
+			spot = self;
+			spot->targetname = NULL;
+
+			return;
+		}
+	} 
+	
+	/* city3 */
+    if (Q_stricmp(level.mapname, "city2") == 0)
+	{
+		if (Q_stricmp(self->targetname, "city2NL") == 0)
+		{
+			spot = G_Spawn();
+			spot = self;
+			spot->targetname = NULL;
+
+			return;
+		}
+	} 
+}
+
 /*
  * QUAKED info_player_start (1 0 0) (-16 -16 -24) (16 16 32)
  * The normal starting point for a level.
@@ -139,7 +283,11 @@ SP_info_player_start(edict_t *self)
 	{
 		return;
 	}
- 
+
+    /* Call function to hack unnamed spawn points */
+	self->think = SP_CreateUnnamedSpawn;
+	self->nextthink = level.time + FRAMETIME;  
+
 	if (!coop->value)
 	{
 		return;
@@ -194,18 +342,22 @@ SP_info_player_coop(edict_t *self)
 
 	if ((Q_stricmp(level.mapname, "jail2") == 0) ||
 		(Q_stricmp(level.mapname, "jail4") == 0) ||
+		(Q_stricmp(level.mapname, "mintro") == 0) ||
 		(Q_stricmp(level.mapname, "mine1") == 0) ||
 		(Q_stricmp(level.mapname, "mine2") == 0) ||
 		(Q_stricmp(level.mapname, "mine3") == 0) ||
 		(Q_stricmp(level.mapname, "mine4") == 0) ||
 		(Q_stricmp(level.mapname, "lab") == 0) ||
 		(Q_stricmp(level.mapname, "boss1") == 0) ||
+		(Q_stricmp(level.mapname, "fact1") == 0) ||
 		(Q_stricmp(level.mapname, "fact3") == 0) ||
+		(Q_stricmp(level.mapname, "waste1") == 0) || /* really? */
 		(Q_stricmp(level.mapname, "biggun") == 0) ||
 		(Q_stricmp(level.mapname, "space") == 0) ||
 		(Q_stricmp(level.mapname, "command") == 0) ||
 		(Q_stricmp(level.mapname, "power2") == 0) ||
-		(Q_stricmp(level.mapname, "strike") == 0))
+		(Q_stricmp(level.mapname, "strike") == 0) ||
+		(Q_stricmp(level.mapname, "city2") == 0))
 	{
 		/* invoke one of our gross, ugly, disgusting hacks */
 		self->think = SP_FixCoopSpots;
@@ -1189,32 +1341,35 @@ SelectSpawnPoint(edict_t *ent, vec3_t origin, vec3_t angles)
 	   spawnpoint due to map bugs (not correctly
 	   connected or the map was loaded via console
 	   and thus no previously map is known to the
-	   client) use one in 384 units radius. */
+	   client) use one in 550 units radius. */
 	if (coop->value)
 	{
 		index = ent->client - game.clients;
 
-		while(counter < 3)
+		if (Q_stricmp(spot->classname, "info_player_start") == 0 && index != 0)
 		{
-			coopspot = G_Find(coopspot, FOFS(classname), "info_player_coop");
-
-			if (!coopspot)
+			while(counter < 3)
 			{
-				break;
-			}
+				coopspot = G_Find(coopspot, FOFS(classname), "info_player_coop");
 
-			VectorSubtract(coopspot->s.origin, spot->s.origin, d);
-
-			if ((VectorLength(d) < 384))
-			{
-				if (index == counter)
+				if (!coopspot)
 				{
-					spot = coopspot;
 					break;
 				}
-				else
+
+				VectorSubtract(coopspot->s.origin, spot->s.origin, d);
+
+				if ((VectorLength(d) < 550))
 				{
-					counter++;
+					if (index == counter)
+					{
+						spot = coopspot;
+						break;
+					}
+					else
+					{
+						counter++;
+					}
 				}
 			}
 		}
diff --git a/src/game/savegame/tables/gamefunc_decs.h b/src/game/savegame/tables/gamefunc_decs.h
index 19d109a3..1516c268 100644
--- a/src/game/savegame/tables/gamefunc_decs.h
+++ b/src/game/savegame/tables/gamefunc_decs.h
@@ -193,6 +193,7 @@ extern void SP_info_player_intermission ( void ) ;
 extern void SP_info_player_coop ( edict_t * self ) ;
 extern void SP_info_player_deathmatch ( edict_t * self ) ;
 extern void SP_info_player_start ( edict_t * self ) ;
+extern void SP_CreateUnnamedSpawn( edict_t *self );
 extern void SP_CreateCoopSpots ( edict_t * self ) ;
 extern void SP_FixCoopSpots ( edict_t * self ) ;
 extern void SP_monster_tank ( edict_t * self ) ;
diff --git a/src/game/savegame/tables/gamefunc_list.h b/src/game/savegame/tables/gamefunc_list.h
index 46f2078c..d4c3cca0 100644
--- a/src/game/savegame/tables/gamefunc_list.h
+++ b/src/game/savegame/tables/gamefunc_list.h
@@ -193,6 +193,7 @@
 {"SP_info_player_coop", (byte *)SP_info_player_coop},
 {"SP_info_player_deathmatch", (byte *)SP_info_player_deathmatch},
 {"SP_info_player_start", (byte *)SP_info_player_start},
+{"SP_CreateUnnamedSpawn", (byte *)SP_CreateUnnamedSpawn},
 {"SP_CreateCoopSpots", (byte *)SP_CreateCoopSpots},
 {"SP_FixCoopSpots", (byte *)SP_FixCoopSpots},
 {"SP_monster_tank", (byte *)SP_monster_tank},