diff --git a/DiffractionGratings/grating3D.geo b/DiffractionGratings/grating3D.geo
index b596ca1f40e00b8d22ca9b6619118303a45262eb..70dabc551fdfb633047a577b83268342512e5529 100644
--- a/DiffractionGratings/grating3D.geo
+++ b/DiffractionGratings/grating3D.geo
@@ -218,9 +218,9 @@ For k In {0:8}
 EndFor
 
 
-If (tag_geom==3) // Split torus weird otherwise
-  Mesh.Algorithm = 6;
-EndIf
-// Mesh.SurfaceEdges = 0;
+// If (tag_geom==3) // Split torus weird otherwise
+//   Mesh.Algorithm = 6;
+// EndIf
+// // Mesh.SurfaceEdges = 0;
 Mesh.VolumeEdges = 0;
 Mesh.ElementOrder = og;
diff --git a/DiffractionGratings/grating3D.pro b/DiffractionGratings/grating3D.pro
index 5c2d3b9eb419541d7ffce79f30c639899c2db156..8ef65f80b4a2deb5f2e9d399ee80b187e8c4f852 100644
--- a/DiffractionGratings/grating3D.pro
+++ b/DiffractionGratings/grating3D.pro
@@ -290,12 +290,12 @@ FunctionSpace {
         { NameOfCoef un3; EntityType FacetsOf ; NameOfConstraint BlochY; }
         { NameOfCoef un4; EntityType FacetsOf ; NameOfConstraint BlochX; }
         { NameOfCoef un4; EntityType FacetsOf ; NameOfConstraint BlochY; }
-        { NameOfCoef un5; EntityType EdgesOf ; NameOfConstraint BlochX; }
-        { NameOfCoef un5; EntityType EdgesOf ; NameOfConstraint BlochY; }
+        { NameOfCoef un5; EntityType EdgesOf  ; NameOfConstraint BlochX; }
+        { NameOfCoef un5; EntityType EdgesOf  ; NameOfConstraint BlochY; }
       EndIf
       { NameOfCoef un3; EntityType FacetsOf ; NameOfConstraint Dirichlet; }
       { NameOfCoef un4; EntityType FacetsOf ; NameOfConstraint Dirichlet; }
-      { NameOfCoef un5; EntityType EdgesOf ; NameOfConstraint Dirichlet; }
+      { NameOfCoef un5; EntityType EdgesOf  ; NameOfConstraint Dirichlet; }
     }
   }
 }
@@ -420,7 +420,7 @@ PostOperation {
       // Print [ epsr_xx , OnElementsOf Omega, File StrCat[myDir,"epsr_xx.pos"]];
       // Print [ H1x , OnElementsOf Omega, File StrCat[myDir,"H1x.pos"]];
       // Print [ Etot , OnElementsOf Omega, File StrCat[myDir,"Etot.pos"]];
-      Print [ u , OnElementsOf Omega, File StrCat[myDir,"u.pos"]];
+      // Print [ u , OnElementsOf Omega, File StrCat[myDir,"u.pos"]];
       // Print [ E1 , OnElementsOf Omega, File StrCat[myDir,"E1.pos"]];
       // Print [ Htotx , OnElementsOf Omega, File StrCat[myDir,"Htotx.pos"]];
       For k In {2:6}
diff --git a/DiffractionGratings/grating3D_data_2Dlamellar.geo b/DiffractionGratings/grating3D_data_2Dlamellar.geo
index dd118042f673314cba98289b919d5230eb9e588a..5e17d64fdcdf7d33696582d0bab173cd0bf12ad8 100644
--- a/DiffractionGratings/grating3D_data_2Dlamellar.geo
+++ b/DiffractionGratings/grating3D_data_2Dlamellar.geo
@@ -59,7 +59,7 @@ DefineConstant[
     refine_mesh_L_4= {0.3       , Name StrCat[pp5,"/7refine layers/4refine mesh layer 4 [-]"]},
     refine_mesh_L_5= {0.3       , Name StrCat[pp5,"/7refine layers/5refine mesh layer 5 [-]"]},
     refine_mesh_L_6= {0.3       , Name StrCat[pp5,"/7refine layers/6refine mesh layer 6 [-]"]},
-    FlagLinkFacets = {0      , Name StrCat[pp5,"/8FlagLinkFacets? [-]"], Choices {0="1",1="2"}},
+    FlagLinkFacets = {0      , Name StrCat[pp5,"/8FlagLinkFacets? [-]"], Choices {0,1}},
     
     InterpSampling     = { 30   , Name StrCat[pp6,"/0Interpolation grid step [nm]"]},
     Flag_interp_cubic  = { 0    , Name StrCat[pp6,"/1Interpolate on cubic grid?"], Choices {0,1} },
diff --git a/DiffractionGratings/grating3D_data_bisin.geo b/DiffractionGratings/grating3D_data_bisin.geo
index b414a938d19706af0ed1afe35906c4f26bfa258e..4f0e0dff56b89b463ac2023d5a86ed2c8a2e02cb 100644
--- a/DiffractionGratings/grating3D_data_bisin.geo
+++ b/DiffractionGratings/grating3D_data_bisin.geo
@@ -59,7 +59,7 @@ DefineConstant[
     refine_mesh_L_4= {1      , Name StrCat[pp5,"/7refine layers/4refine mesh layer 4 [-]"]},
     refine_mesh_L_5= {1      , Name StrCat[pp5,"/7refine layers/5refine mesh layer 5 [-]"]},
     refine_mesh_L_6= {1      , Name StrCat[pp5,"/7refine layers/6refine mesh layer 6 [-]"]},
-    FlagLinkFacets = {0      , Name StrCat[pp5,"/8FlagLinkFacets? [-]"], Choices {0="1",1="2"}},
+    FlagLinkFacets = {0      , Name StrCat[pp5,"/8FlagLinkFacets? [-]"], Choices {0,1}},
     
     InterpSampling     = { 30   , Name StrCat[pp6,"/0Interpolation grid step [nm]"]},
     Flag_interp_cubic  = { 1    , Name StrCat[pp6,"/1Interpolate on cubic grid?"], Choices {0,1} },
diff --git a/DiffractionGratings/grating3D_data_checker.geo b/DiffractionGratings/grating3D_data_checker.geo
index c670907f05ac40edf23bb0b84bd0b734c69e8892..140101442984ebe542597bb97d8909809d77072a 100644
--- a/DiffractionGratings/grating3D_data_checker.geo
+++ b/DiffractionGratings/grating3D_data_checker.geo
@@ -59,7 +59,7 @@ DefineConstant[
     refine_mesh_L_4= {1      , Name StrCat[pp5,"/7refine layers/4refine mesh layer 4 [-]"]},
     refine_mesh_L_5= {1      , Name StrCat[pp5,"/7refine layers/5refine mesh layer 5 [-]"]},
     refine_mesh_L_6= {1      , Name StrCat[pp5,"/7refine layers/6refine mesh layer 6 [-]"]},
-    FlagLinkFacets = {0      , Name StrCat[pp5,"/8FlagLinkFacets? [-]"], Choices {0="1",1="2"}},
+    FlagLinkFacets = {0      , Name StrCat[pp5,"/8FlagLinkFacets? [-]"], Choices {0,1}},
     
     InterpSampling     = { 30   , Name StrCat[pp6,"/0Interpolation grid step [nm]"]},
     Flag_interp_cubic  = { 1    , Name StrCat[pp6,"/1Interpolate on cubic grid?"], Choices {0,1} },
diff --git a/DiffractionGratings/grating3D_data_halfellipsoid.geo b/DiffractionGratings/grating3D_data_halfellipsoid.geo
index 98307e1792f54d0b739f90ea9c88714936c46e77..ea82c889c487f1c7dfdf8a502af39103d800cc1f 100644
--- a/DiffractionGratings/grating3D_data_halfellipsoid.geo
+++ b/DiffractionGratings/grating3D_data_halfellipsoid.geo
@@ -59,7 +59,7 @@ DefineConstant[
     refine_mesh_L_4= {1     , Name StrCat[pp5,"/7refine layers/4refine mesh layer 4 [-]"]},
     refine_mesh_L_5= {1     , Name StrCat[pp5,"/7refine layers/5refine mesh layer 5 [-]"]},
     refine_mesh_L_6= {1     , Name StrCat[pp5,"/7refine layers/6refine mesh layer 6 [-]"]},
-    FlagLinkFacets = {0      , Name StrCat[pp5,"/8FlagLinkFacets? [-]"], Choices {0="1",1="2"}},
+    FlagLinkFacets = {0      , Name StrCat[pp5,"/8FlagLinkFacets? [-]"], Choices {0,1}},
         
     InterpSampling     = { 10   , Name StrCat[pp6,"/0Interpolation grid step [nm]"]},
     Flag_interp_cubic  = { 1    , Name StrCat[pp6,"/1Interpolate on cubic grid?"], Choices {0,1} },
diff --git a/DiffractionGratings/grating3D_data_hole.geo b/DiffractionGratings/grating3D_data_hole.geo
index 3b42b6a778bba646f7670719c81245f597aebc95..399d0a9c40ab12fb8128516ef4ddf0d87fb1c3ac 100644
--- a/DiffractionGratings/grating3D_data_hole.geo
+++ b/DiffractionGratings/grating3D_data_hole.geo
@@ -59,7 +59,7 @@ DefineConstant[
     refine_mesh_L_4= {1      , Name StrCat[pp5,"/7refine layers/4refine mesh layer 4 [-]"]},
     refine_mesh_L_5= {1      , Name StrCat[pp5,"/7refine layers/5refine mesh layer 5 [-]"]},
     refine_mesh_L_6= {1      , Name StrCat[pp5,"/7refine layers/6refine mesh layer 6 [-]"]},
-    FlagLinkFacets = {0      , Name StrCat[pp5,"/8FlagLinkFacets? [-]"], Choices {0="1",1="2"}},
+    FlagLinkFacets = {0      , Name StrCat[pp5,"/8FlagLinkFacets? [-]"], Choices {0,1}},
     
     InterpSampling     = { 30   , Name StrCat[pp6,"/0Interpolation grid step [nm]"]},
     Flag_interp_cubic  = { 1    , Name StrCat[pp6,"/1Interpolate on cubic grid?"], Choices {0,1} },
diff --git a/DiffractionGratings/grating3D_data_pyramid.geo b/DiffractionGratings/grating3D_data_pyramid.geo
index bab8d7f7d10ebbe1d72b58edd4a52a7513ecd342..c466109b1e2b3a8271e65c2d8677e289e40dbf04 100644
--- a/DiffractionGratings/grating3D_data_pyramid.geo
+++ b/DiffractionGratings/grating3D_data_pyramid.geo
@@ -59,7 +59,7 @@ DefineConstant[
     refine_mesh_L_4= {1     , Name StrCat[pp5,"/7refine layers/4refine mesh layer 4 [-]"]},
     refine_mesh_L_5= {1     , Name StrCat[pp5,"/7refine layers/5refine mesh layer 5 [-]"]},
     refine_mesh_L_6= {1     , Name StrCat[pp5,"/7refine layers/6refine mesh layer 6 [-]"]},
-    FlagLinkFacets = {0      , Name StrCat[pp5,"/8FlagLinkFacets? [-]"], Choices {0="1",1="2"}},
+    FlagLinkFacets = {0      , Name StrCat[pp5,"/8FlagLinkFacets? [-]"], Choices {0,1}},
 
     InterpSampling     = { 50   , Name StrCat[pp6,"/0Interpolation grid step [nm]"]},
     Flag_interp_cubic  = { 1    , Name StrCat[pp6,"/1Interpolate on cubic grid?"], Choices {0,1} },
diff --git a/DiffractionGratings/grating3D_data_solarcell.geo b/DiffractionGratings/grating3D_data_solarcell.geo
index 6b36721af529ee2f8b87b770f217d383c709fdbc..41376697a7f3a36b4f085f4f356b553d0e03c8d7 100644
--- a/DiffractionGratings/grating3D_data_solarcell.geo
+++ b/DiffractionGratings/grating3D_data_solarcell.geo
@@ -61,7 +61,7 @@ DefineConstant[
     refine_mesh_L_4= {2      , Name StrCat[pp5,"/7refine layers/4refine mesh layer 4 [-]"]},
     refine_mesh_L_5= {2      , Name StrCat[pp5,"/7refine layers/5refine mesh layer 5 [-]"]},
     refine_mesh_L_6= {2      , Name StrCat[pp5,"/7refine layers/6refine mesh layer 6 [-]"]},
-    FlagLinkFacets = {0      , Name StrCat[pp5,"/8FlagLinkFacets? [-]"], Choices {0="1",1="2"}},
+    FlagLinkFacets = {0      , Name StrCat[pp5,"/8FlagLinkFacets? [-]"], Choices {0,1}},
 
     
     InterpSampling     = { 20   , Name StrCat[pp6,"/0Interpolation grid step [nm]"]},