diff --git a/e2-estia.i b/e2-estia.i
index 409f958..3162c68 100644
--- a/e2-estia.i
+++ b/e2-estia.i
@@ -198,7 +198,7 @@ c --------------- PHYSICS CARDS --------------------------
 c -------------------------------------------------------
 c dbcn 375642321 j j j j j j j j j j j 15291711
 c stop calculation either at XeY histories, 6.5 days or tally 15 error <0.001
-stop nps 2e8 CTME 4e5 $f31 0.01
+stop nps 1e4 CTME 4e5 $f31 0.01
 rand gen=2 seed=29976355590901 $ default 19073486328125
 c histp
 mode  n p h / z $ neutron, photon, proton, pi+, pi0
@@ -235,10 +235,10 @@ c * Estimated source within bunker wall to optimize collimator efficiency
 c read file=sources/bunker_wall.i echo $ approximate, not for official results
 c * McStas source terms for gamma doeses
 c read file=sources/mcstas_source_vs.i echo
-c read file=sources/mcstas_source_sample.i echo
+read file=sources/mcstas_source_sample.i echo
 c read file=sources/mcstas_source_mf.i echo
 c read file=sources/mcstas_gammas.i echo
-read file=sources/mcstas_gammas_2.i echo
+c read file=sources/mcstas_gammas_2.i echo
 c read file=sources/mcstas_source_shutter.i echo
 prdmp 5e6 -30 1 2 5e5
 print 30 32 40 
diff --git a/geometry/estia_cave.i b/geometry/estia_cave.i
index 7e76f15..43c0bc1 100644
--- a/geometry/estia_cave.i
+++ b/geometry/estia_cave.i
@@ -29,8 +29,8 @@ c ceiling
          -208812 -208811 -208802) #(-208311 208809 208312)
 208721    49 0.074981   208313 208702 208709 208809 208711 208712
 c sample position
-c 209001 19 -8.65  -209002 209003 -209004
-209001      0       -209001
+209001 19 -8.65  -209002 209003 -209004
+c 209001      0       -209001
 c 209001 4 -1.2E-3  -209001
 c area around cave
 209900     4 -1.2E-3   208709 208710 -100104 (-208708:-208707) 208703 208203
diff --git a/geometry/estia_surfaces.i b/geometry/estia_surfaces.i
index e60a0d9..0c53c33 100644
--- a/geometry/estia_surfaces.i
+++ b/geometry/estia_surfaces.i
@@ -624,9 +624,9 @@ c  Vacuum vessels before S1/S1-S2
 208942 13 px  50.0
 c Sphere/disk at sample position to simulate gamma generation
 209001 s  2280 -3180 -30 1.0
-c 209002 15 cx 5.0
-c 209003 15 px -0.05 
-c 209004 15 px  0.05
+209002 15 cx 5.0
+209003 15 px -0.05 
+209004 15 px  0.05
 c Sphere/disk at MF position to simulate gamma generation from mask
 209012 13 cx 5.0
 209013 13 px -0.05