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 3f25cf1..33b56dc 100644
--- a/geometry/estia_cave.i
+++ b/geometry/estia_cave.i
@@ -1,10 +1,10 @@
 c Experimental cave
 c
 c Sample Position
-209900  19 -8.65   -209002 209003 -209004 $ Cd
+c 209900  19 -8.65   -209002 209003 -209004 $ Cd
 c 209900  2  -7.08   -209002 209003 -209004  $ GGG
 c 209900  115 -1     -209001 $ water
-c 209900  4 -1.2E-3  -209001 $ Air
+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
diff --git a/geometry/estia_mf.i b/geometry/estia_mf.i
index 2471f53..b35ef80 100644
--- a/geometry/estia_mf.i
+++ b/geometry/estia_mf.i
@@ -44,11 +44,11 @@ c Changer wheel
 230202   5 0.0582256   230202 -230231  -230238
 230203   5 0.0582256   230231 -230232  230234 -230233  230236 -230235  230237  
 c B4C-Al mask absorber at middle focus
-230210 22 -2.7        230201 -230202  -230211
+c 230210 22 -2.7        230201 -230202  -230211
 c Cd absorber at middle focus
 c 230210 19 -8.65        230201 -230202  -230211
 c Free flight path through wheel
-c 230210      0          230201 -230202  -230211
+230210      0          230201 -230202  -230211
 230211      0          230200 -230201  -230211
 c Incoherent scatterer 10cm length with B-Al shield around
 c 230210 21 -6.11        230200 -230202  -230229