diff --git a/HEN_HOUSE/omega/beamnrc/CMs/BLOCK_macros.mortran b/HEN_HOUSE/omega/beamnrc/CMs/BLOCK_macros.mortran
index e051bfb4e..afad2afb1 100644
--- a/HEN_HOUSE/omega/beamnrc/CMs/BLOCK_macros.mortran
+++ b/HEN_HOUSE/omega/beamnrc/CMs/BLOCK_macros.mortran
@@ -66,7 +66,7 @@
 "-------------------------------------------------------------------------------
 "
 REPLACE {$MAX_SUB_$BLOCK} WITH {20}
-REPLACE {$MAX_POINT_$BLOCK} WITH {50}
+REPLACE {$MAX_POINT_$BLOCK} WITH {1000}
 "       ==================="
 ;
 "-------------------------------------------------------------------------------
diff --git a/HEN_HOUSE/omega/beamnrc/CMs/SYNCHDMLC_macros.mortran b/HEN_HOUSE/omega/beamnrc/CMs/SYNCHDMLC_macros.mortran
index bd36bef6c..fadb53e88 100644
--- a/HEN_HOUSE/omega/beamnrc/CMs/SYNCHDMLC_macros.mortran
+++ b/HEN_HOUSE/omega/beamnrc/CMs/SYNCHDMLC_macros.mortran
@@ -90,7 +90,7 @@ REPLACE {$MAXIMUM_N_$SYNCHDMLC} WITH {3};
 REPLACE {$MAXLEAF} WITH {160}
 
 " The max no. of different fields--dynamic and step-and-shoot only"
-REPLACE {$MAXFIELD_$SYNCHDMLC} WITH {1024}
+REPLACE {$MAXFIELD_$SYNCHDMLC} WITH {5000}
 
 "used for arrays that store data for each leaf for each field"
 REPLACE {$MAXFIELDLEAF} WITH {{COMPUTE $MAXLEAF*$MAXFIELD_$SYNCHDMLC}}
diff --git a/HEN_HOUSE/omega/beamnrc/CMs/SYNCJAWS_macros.mortran b/HEN_HOUSE/omega/beamnrc/CMs/SYNCJAWS_macros.mortran
index 3b1805e30..b82cabfd6 100644
--- a/HEN_HOUSE/omega/beamnrc/CMs/SYNCJAWS_macros.mortran
+++ b/HEN_HOUSE/omega/beamnrc/CMs/SYNCJAWS_macros.mortran
@@ -69,7 +69,7 @@
 "-------------------------------------------------------------------------------
 REPLACE {$MAX_N_$SYNCJAWS} WITH {12}
 
-REPLACE {$MAXFIELD_$SYNCJAWS} WITH {1024}
+REPLACE {$MAXFIELD_$SYNCJAWS} WITH {5000}
 
 REPLACE {$MAXFS_$SYNCJAWS} WITH {{COMPUTE $MAX_N_$SYNCJAWS*$MAXFIELD_$SYNCJAWS}}
 
diff --git a/HEN_HOUSE/omega/beamnrc/CMs/SYNCMLCE_macros.mortran b/HEN_HOUSE/omega/beamnrc/CMs/SYNCMLCE_macros.mortran
index 82e3736a3..eb0326a01 100644
--- a/HEN_HOUSE/omega/beamnrc/CMs/SYNCMLCE_macros.mortran
+++ b/HEN_HOUSE/omega/beamnrc/CMs/SYNCMLCE_macros.mortran
@@ -79,7 +79,7 @@ REPLACE {$MAXIMUM_N_$SYNCMLCE} WITH {3}
 REPLACE {$MAXLEAF} WITH {170}
 
 " The max no. of different fields--dynamic and step-and-shoot only"
-REPLACE {$MAXFIELD_$SYNCMLCE} WITH {1024}
+REPLACE {$MAXFIELD_$SYNCMLCE} WITH {5000}
 
 "used for arrays that store data for each leaf for each field"
 REPLACE {$MAXFIELDLEAF} WITH {{COMPUTE $MAXLEAF*$MAXFIELD_$SYNCMLCE}}
diff --git a/HEN_HOUSE/omega/beamnrc/CMs/SYNCVMLC_macros.mortran b/HEN_HOUSE/omega/beamnrc/CMs/SYNCVMLC_macros.mortran
index 3aa9373fd..05765f3c4 100644
--- a/HEN_HOUSE/omega/beamnrc/CMs/SYNCVMLC_macros.mortran
+++ b/HEN_HOUSE/omega/beamnrc/CMs/SYNCVMLC_macros.mortran
@@ -78,7 +78,7 @@ REPLACE {$MAXIMUM_N_$SYNCVMLC} WITH {3};
 REPLACE {$MAXLEAF} WITH {160}
 
 " The max no. of different fields--dynamic and step-and-shoot only"
-REPLACE {$MAXFIELD_$SYNCVMLC} WITH {1024}
+REPLACE {$MAXFIELD_$SYNCVMLC} WITH {5000}
 
 "used for arrays that store data for each leaf for each field"
 REPLACE {$MAXFIELDLEAF} WITH {{COMPUTE $MAXLEAF*$MAXFIELD_$SYNCVMLC}}
diff --git a/HEN_HOUSE/omega/progs/statdose/statdose.mortran b/HEN_HOUSE/omega/progs/statdose/statdose.mortran
index dd9442428..96c2ed5fd 100644
--- a/HEN_HOUSE/omega/progs/statdose/statdose.mortran
+++ b/HEN_HOUSE/omega/progs/statdose/statdose.mortran
@@ -208,10 +208,10 @@ REPLACE {$MAXCURVE} WITH {10};
 REPLACE {$MAXPOINTS} WITH {400};
 
 " - maximum number of voxels in each direction which can be used
-REPLACE {$MAXVOXX} WITH {28};
-REPLACE {$MAXVOXY} WITH {28};
-REPLACE {$MAXVOXZ} WITH {400};
-REPLACE {$MAXVOXEL} WITH {400};  "Note: MAXVOLXEL must be the greatest of "
+REPLACE {$MAXVOXX} WITH {128};
+REPLACE {$MAXVOXY} WITH {128};
+REPLACE {$MAXVOXZ} WITH {128};
+REPLACE {$MAXVOXEL} WITH {128};  "Note: MAXVOLXEL must be the greatest of "
                            "the above 3 values!!"
 "Note the main arrays are dimensioned $NDIST1_MAX*$MAXVOXX*$MAXVOXY*$MAXVOXZ"
 "2 x 128 x 128 x64 compiles under linux at NRC, but NOT SGI with 80MByte"
diff --git a/HEN_HOUSE/src/egsnrc.macros b/HEN_HOUSE/src/egsnrc.macros
index a952ec628..0f8decbcc 100644
--- a/HEN_HOUSE/src/egsnrc.macros
+++ b/HEN_HOUSE/src/egsnrc.macros
@@ -1395,8 +1395,8 @@ REPLACE {$ENEPS} WITH {0.0001}
             "DIFFERENCE BETWEEN ECUT AND END POINT ENERGY FOR"
             "RANGE CALCULATION"
 
-REPLACE {$EPSEMFP} WITH {1.E-5}  "SMALLEST ELECTRON MFP VALUE"
-REPLACE {$EPSGMFP} WITH {1.E-5}  "SMALLEST GAMMA MFP VALUE"
+REPLACE {$EPSEMFP} WITH {1.E-8}  "SMALLEST ELECTRON MFP VALUE"
+REPLACE {$EPSGMFP} WITH {1.E-8}  "SMALLEST GAMMA MFP VALUE"
 ;  "---------- BUFFER FLUSH SEMICOLON ----------"
 
 "THE FOLLOWING ARE UTILITY AND OTHER MACROS FOR THE USER"
diff --git a/HEN_HOUSE/user_codes/cavity/array_sizes.h b/HEN_HOUSE/user_codes/cavity/array_sizes.h
index 55db880aa..14ac710f4 100644
--- a/HEN_HOUSE/user_codes/cavity/array_sizes.h
+++ b/HEN_HOUSE/user_codes/cavity/array_sizes.h
@@ -41,7 +41,7 @@
 #ifndef ARRAY_SIZES_
 #define ARRAY_SIZES_
 
-#define MXMED   10
-#define MXSTACK 2000
+#define MXMED   20
+#define MXSTACK 10000
 
 #endif
diff --git a/HEN_HOUSE/user_codes/dosxyznrc/dosxyznrc_user_macros.mortran b/HEN_HOUSE/user_codes/dosxyznrc/dosxyznrc_user_macros.mortran
index 169d0d83d..3b9a779e1 100644
--- a/HEN_HOUSE/user_codes/dosxyznrc/dosxyznrc_user_macros.mortran
+++ b/HEN_HOUSE/user_codes/dosxyznrc/dosxyznrc_user_macros.mortran
@@ -87,7 +87,7 @@
 "
 REPLACE {$STAT}    WITH {10}  "Number of batches to use in calcn of statistics"
                               "It works with $STAT = 1 but gives no stats"
-REPLACE {$MXMED}   WITH {7}   "Maximum number of media
+REPLACE {$MXMED}   WITH {20}   "Maximum number of media
 REPLACE {$MXSTACK} WITH {10000}  "Maximum particle stack size
 REPLACE {$IMAX}    WITH {128} "Maximum number of x cells
 REPLACE {$JMAX}    WITH {128} "Maximum number of y cells
diff --git a/HEN_HOUSE/user_codes/egs_fac/array_sizes.h b/HEN_HOUSE/user_codes/egs_fac/array_sizes.h
index f9201080f..4e1b6511d 100644
--- a/HEN_HOUSE/user_codes/egs_fac/array_sizes.h
+++ b/HEN_HOUSE/user_codes/egs_fac/array_sizes.h
@@ -41,7 +41,7 @@
 #ifndef ARRAY_SIZES_
 #define ARRAY_SIZES_
 
-#define MXMED   10
+#define MXMED   20
 #define MXSTACK 20000
 
 #endif
diff --git a/HEN_HOUSE/user_codes/tutor7pp/array_sizes.h b/HEN_HOUSE/user_codes/tutor7pp/array_sizes.h
index d376ef1f0..8d9f4c7bc 100644
--- a/HEN_HOUSE/user_codes/tutor7pp/array_sizes.h
+++ b/HEN_HOUSE/user_codes/tutor7pp/array_sizes.h
@@ -40,6 +40,6 @@
 
 #ifndef ARRAY_SIZES_
 #define ARRAY_SIZES_
-#define MXMED 10
+#define MXMED 20
 #define MXSTACK 50
 #endif