diff --git a/Common/Visibility.cpp b/Common/Visibility.cpp
index c19f4425904f346bd7d2cf3fe7d657f94bb33db0..0253566f3d26435a1b16a9cc5e2f698dbe61507e 100644
--- a/Common/Visibility.cpp
+++ b/Common/Visibility.cpp
@@ -1,4 +1,4 @@
-// $Id: Visibility.cpp,v 1.20 2006-11-27 22:22:08 geuzaine Exp $
+// $Id: Visibility.cpp,v 1.21 2006-11-28 20:17:44 geuzaine Exp $
 //
 // Copyright (C) 1997-2007 C. Geuzaine, J.-F. Remacle
 //
@@ -61,9 +61,7 @@ void VisibilityManager::update(int type)
 {
   _labels.clear();
 
-  // FIXME: this sometimes leads to crashes -- investigate
-  //Tree_Action(Symbol_T, setLabels);
-  //printf("updating vis man\n");
+  if(Tree_Nbr(Symbol_T)) Tree_Action(Symbol_T, setLabels);
 
   for(unsigned int i = 0; i < _entities.size(); i++)
     delete _entities[i];
diff --git a/Makefile b/Makefile
index ff79eab3666ee0f004b7dfbbe710caf732f20b96..a9498310d60a89b7afcd0221132bf013abda6b06 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.422 2006-11-27 22:22:06 geuzaine Exp $
+# $Id: Makefile,v 1.423 2006-11-28 20:17:44 geuzaine Exp $
 #
 # Copyright (C) 1997-2007 C. Geuzaine, J.-F. Remacle
 #
@@ -256,7 +256,7 @@ package-mac:
 	cp Fltk/MacIconsGeo.icns gmsh-${GMSH_VERSION}/Gmsh.app/Contents/Resources/GmshGeo.icns
 	cp Fltk/MacIconsMsh.icns gmsh-${GMSH_VERSION}/Gmsh.app/Contents/Resources/GmshMsh.icns
 	cp Fltk/MacIconsPos.icns gmsh-${GMSH_VERSION}/Gmsh.app/Contents/Resources/GmshPos.icns
-	cp -R doc/gmsh.1 tutorial demos gmsh-${GMSH_VERSION}
+	cp -R tutorial demos gmsh-${GMSH_VERSION}
 	cp doc/VERSIONS gmsh-${GMSH_VERSION}/VERSIONS.txt
 	cp doc/FAQ gmsh-${GMSH_VERSION}/FAQ.txt
 	cp doc/CREDITS gmsh-${GMSH_VERSION}/CREDITS.txt
diff --git a/tutorial/t3.geo b/tutorial/t3.geo
index 05726e9f07e2bc8620fcaf46c8a2baadd2abdc55..783ae86f215ea5e1d486db73040e1b5ab488ebc9 100644
--- a/tutorial/t3.geo
+++ b/tutorial/t3.geo
@@ -53,32 +53,20 @@ Physical Volume(101) = {1, 2, out[1]};
 
 // Let us now change some options... Since all interactive options are
 // accessible in Gmsh's scripting language, we can for example define
-// a global characteristic length factor, redefine some background
-// colors, disable the display of the axes, and select an initial
-// viewpoint in XYZ mode (disabling the interactive trackball-like
-// rotation mode) directly in the input file:
+// a global characteristic length factor or redefine some colors
+// directly in the input file:
 
 Mesh.CharacteristicLengthFactor = 4;
-General.Color.Background = {120,120,120};
-General.Color.Foreground = {255,255,255};
 General.Color.Text = White;
 Geometry.Color.Points = Orange;
-General.Axes = 0;
-General.Trackball = 0;
-General.RotationCenterGravity = 0;
-General.RotationCenterX = 0;
-General.RotationCenterY = 0;
-General.RotationCenterZ = 0;
-General.RotationX = 10;
-General.RotationY = 70;
-General.TranslationX = -0.2;
+Mesh.Color.Points = {255,0,0};
 
 // Note that all colors can be defined literally or numerically, i.e.
-// `General.Color.Background = Red' is equivalent to
-// `General.Color.Background = {255,0,0}'; and also note that, as with
-// user-defined variables, the options can be used either as right or
-// left hand sides, so that the following command will set the surface
-// color to the same color as the points:
+// `Mesh.Color.Points = Red' is equivalent to `Mesh.Color.Points =
+// {255,0,0}'; and also note that, as with user-defined variables, the
+// options can be used either as right or left hand sides, so that the
+// following command will set the surface color to the same color as
+// the points:
 
 Geometry.Color.Surfaces = Geometry.Color.Points;
 
diff --git a/tutorial/t6.geo b/tutorial/t6.geo
index 4ef01d1f3b0a74fee22d1ed1fb31e6532e4853f2..f0e5e05e693366fa797e0d4bd60f3658ba360217 100644
--- a/tutorial/t6.geo
+++ b/tutorial/t6.geo
@@ -6,8 +6,8 @@
  *
  *********************************************************************/
 
-// We use the geometry from the first tutorial as a basis for this
-// tutorial:
+// Let's use the geometry from the first tutorial as a basis for this
+// one
 Include "t1.geo";
 
 // Put 20 equidistant points on curve 4
@@ -24,11 +24,11 @@ Transfinite Line{-1,3} = 30 Using Progression 1.2;
 // of the transfinite interpolation
 Transfinite Surface{6} = {1,2,3,4};
 
-// Please note that the list on the right hand side refers to points,
-// not curves. The way triangles are generated can be controlled by
-// appending "Left", "Right" or "Alternate" after the list.
+// (Note that the list on the right hand side refers to points, not
+// curves. The way triangles are generated can be controlled by
+// appending "Left", "Right" or "Alternate" after the list.)
 
-// Recombine the transfinite mesh into quads
+// Recombine the triangles into quads
 Recombine Surface{6};
 
 // Apply an elliptic smoother to the grid