diff --git a/e2-estia.i b/e2-estia.i
index 8a546fa..74ed84b 100644
--- a/e2-estia.i
+++ b/e2-estia.i
@@ -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 33b56dc..60d3cc3 100644
--- a/geometry/estia_cave.i
+++ b/geometry/estia_cave.i
@@ -3,8 +3,8 @@ c
 c Sample Position
 c 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
+209900  115 -1     -209001 $ water
+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 -2.42   100059 -210107    210132 -210133   210113 -210114