diff --git a/e2-estia.i b/e2-estia.i
index b528024..e0b527c 100644
--- a/e2-estia.i
+++ b/e2-estia.i
@@ -220,7 +220,7 @@ 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
 c nps 39242646 $ works with rssa file from McStas, original tracks 39242646
-stop nps 1e8 CTME 4e5 $f31 0.01
+stop nps 1e7 CTME 4e5 $f31 0.01
 c nps 28e11 $ works with rssa file, value is scaled to 20x source particles
 c write particle tracks
 c ssw 206505 pty=n $ record all neutron tracks crossing outward
@@ -270,11 +270,11 @@ 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_rssa.i echo
 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
 c read file=sources/mcstas_gammas_2.i echo
-read file=sources/mcstas_source_shutter.i echo
+c read file=sources/mcstas_source_shutter.i echo
 prdmp -120 -30 1 2 5e5
 print 30 32 40 
 c      120 $O importance function quality
diff --git a/geometry/estia_cave.i b/geometry/estia_cave.i
index a3ba451..440f721 100644
--- a/geometry/estia_cave.i
+++ b/geometry/estia_cave.i
@@ -1,10 +1,10 @@
 c Experimental cave
 c
 c Sample Position
-c 209900  19 -8.65   -209002 209003 -209004 $ Cd
+209900  19 -8.65   -209002 209003 -209004 $ Cd
 c 209900  2  -7.08   -209002 209003 -209004  $ GGG
 c 209900  115 -1     -209001 $ water
-209900  4 -1.2E-3  -209001 $ Air
+c 209900  4 -1.2E-3  -209001 $ Air
 c Experimental cave final design MShield, separate concrete elements
 c wall stones, starting on Skadi side upstream
 c 210000  50 0.074981   100059 -210107    210132 -210133   210113 -210114