diff --git a/tools/mbspc/botlib/be_aas_reach.c b/tools/mbspc/botlib/be_aas_reach.c
index ca43cdb9..182cf478 100644
--- a/tools/mbspc/botlib/be_aas_reach.c
+++ b/tools/mbspc/botlib/be_aas_reach.c
@@ -60,7 +60,7 @@ extern aas_settings_t aassettings;
 
 //NOTE: all travel times are in hundreth of a second
 //maximum number of reachability links
-#define AAS_MAX_REACHABILITYSIZE			65536
+#define AAS_MAX_REACHABILITYSIZE			128000		//******	(was 65536		only for very complex maps		#Spakk#	)
 //number of areas reachability is calculated for each frame
 #define REACHABILITYAREASPERCYCLE			15
 //number of units reachability points are placed inside the areas
@@ -2648,7 +2648,7 @@ int AAS_Reachability_Ladder(int area1num, int area2num)
 					lreach->next = areareachability[area2num];
 					areareachability[area2num] = lreach;
 					//
-					reach_jump++;	
+					reach_jump++;
 					//
 					return qtrue;
 #ifdef REACH_DEBUG
@@ -3728,7 +3728,7 @@ void AAS_Reachability_JumpPad(void)
 													SE_TOUCHJUMPPAD|SE_TOUCHTELEPORTER|SE_HITGROUNDAREA, area2num, visualize);
 						//if prediction time wasn't enough to fully predict the movement
 						//don't enter slime or lava and don't fall from too high
-						if (move.frames < 30 && 
+						if (move.frames < 30 &&
 								!(move.stopevent & (SE_ENTERSLIME|SE_ENTERLAVA|SE_HITGROUNDDAMAGE))
 								&& (move.stopevent & (SE_HITGROUNDAREA|SE_TOUCHJUMPPAD|SE_TOUCHTELEPORTER)))
 						{
@@ -4076,7 +4076,7 @@ int AAS_Reachability_WeaponJump(int area1num, int area2num)
 												SE_TOUCHJUMPPAD|SE_HITGROUND|SE_HITGROUNDAREA, area2num, visualize);
 					//if prediction time wasn't enough to fully predict the movement
 					//don't enter slime or lava and don't fall from too high
-					if (move.frames < 30 && 
+					if (move.frames < 30 &&
 							!(move.stopevent & (SE_ENTERSLIME|SE_ENTERLAVA|SE_HITGROUNDDAMAGE))
 								&& (move.stopevent & (SE_HITGROUNDAREA|SE_TOUCHJUMPPAD)))
 					{
diff --git a/tools/mbspc/mbspc/q3files.h b/tools/mbspc/mbspc/q3files.h
index 671500a0..3788fb8c 100644
--- a/tools/mbspc/mbspc/q3files.h
+++ b/tools/mbspc/mbspc/q3files.h
@@ -130,7 +130,7 @@ typedef struct md3Tag_s {
 */
 
 typedef struct {
-	int		ident;				// 
+	int		ident;				//
 
 	char	name[MAX_QPATH];	// polyset name
 
@@ -177,7 +177,7 @@ typedef struct {
 	int			flags;
 
 	int			numFrames;
-	int			numTags;			
+	int			numTags;
 	int			numSurfaces;
 
 	int			numSkins;
@@ -216,26 +216,26 @@ typedef struct {
 // there shouldn't be any problem with increasing these values at the
 // expense of more memory allocation in the utilities
 #define	Q3_MAX_MAP_MODELS		0x400
-#define	Q3_MAX_MAP_BRUSHES		0x8000
-#define	Q3_MAX_MAP_ENTITIES	0x800
-#define	Q3_MAX_MAP_ENTSTRING	0x10000
-#define	Q3_MAX_MAP_SHADERS		0x400
+#define	Q3_MAX_MAP_BRUSHES		0x10000		//******		was		0x8000		#SpaKK - to align with Q3Map2	#
+#define	Q3_MAX_MAP_ENTITIES		0x1000		//******		was		0x800		#SpaKK			''				#
+#define	Q3_MAX_MAP_ENTSTRING	0x80000		//******		was		0x10000		#SpaKK			''				#
+#define	Q3_MAX_MAP_SHADERS		0x800		//******		was		0x400		#SpaKK			''				#
 
 #define	Q3_MAX_MAP_AREAS		0x100	// MAX_MAP_AREA_BYTES in q_shared must match!
-#define	Q3_MAX_MAP_FOGS		0x100
-#define	Q3_MAX_MAP_PLANES		0x10000
-#define	Q3_MAX_MAP_NODES		0x10000
-#define	Q3_MAX_MAP_BRUSHSIDES	0x10000
-#define	Q3_MAX_MAP_LEAFS		0x10000
-#define	Q3_MAX_MAP_LEAFFACES	0x10000
-#define	Q3_MAX_MAP_LEAFBRUSHES	0x10000
-#define	Q3_MAX_MAP_PORTALS		0x10000
-#define	Q3_MAX_MAP_LIGHTING	0x400000
-#define	Q3_MAX_MAP_LIGHTGRID	0x400000
+#define	Q3_MAX_MAP_FOGS			0x100		//******		want	30			#SpaKK			''				#
+#define	Q3_MAX_MAP_PLANES		0x100000	//******		was		0x10000		#SpaKK			''				#
+#define	Q3_MAX_MAP_NODES		0x20000		//******		was		0x10000		#SpaKK			''				#
+#define	Q3_MAX_MAP_BRUSHSIDES	0x100000	//******		was		0x10000		#SpaKK			''				#
+#define	Q3_MAX_MAP_LEAFS		0x20000		//******		was		0x10000		#SpaKK			''				#
+#define	Q3_MAX_MAP_LEAFFACES	0x100000	//******		was		0x10000		#SpaKK			''				#
+#define	Q3_MAX_MAP_LEAFBRUSHES	0x40000		//******		was		0x10000		#SpaKK			''				#
+#define	Q3_MAX_MAP_PORTALS		0x20000		//******		was		0x10000		#SpaKK			''				#
+#define	Q3_MAX_MAP_LIGHTING		0x800000	//******		was		0x400000	#SpaKK			''				#
+#define	Q3_MAX_MAP_LIGHTGRID	0x100000	//******		was		0x400000	#SpaKK			''				#
 #define	Q3_MAX_MAP_VISIBILITY	0x200000
 
 #define	Q3_MAX_MAP_DRAW_SURFS	0x20000
-#define	Q3_MAX_MAP_DRAW_VERTS	0x80000
+#define	Q3_MAX_MAP_DRAW_VERTS	0x100000	//******		was		0x80000		#SpaKK			''				#
 #define	Q3_MAX_MAP_DRAW_INDEXES	0x80000
 
 
diff --git a/tools/mbspc/mbspc/qbsp.h b/tools/mbspc/mbspc/qbsp.h
index e401dd6c..2cc7319a 100644
--- a/tools/mbspc/mbspc/qbsp.h
+++ b/tools/mbspc/mbspc/qbsp.h
@@ -274,8 +274,8 @@ extern int numplanes;
 // map.c
 //=============================================================================
 
-#define MAX_MAPFILE_PLANES			256000
-#define MAX_MAPFILE_BRUSHES			65535
+#define MAX_MAPFILE_PLANES			512000  				//******	 (	orig....	256000	#SpaKK#		)
+#define MAX_MAPFILE_BRUSHES			128000					//******	 (	orig....	65535	#SpaKK#		)
 #define MAX_MAPFILE_BRUSHSIDES		(MAX_MAPFILE_BRUSHES*8)
 #define MAX_MAPFILE_TEXINFO			8192