diff --git a/Common/DefaultOptions.h b/Common/DefaultOptions.h
index 89b6da0ed389589b54555f631c22129f98f57891..2526e78b958bc2abf81c45766203cff5ccf2ae8e 100644
--- a/Common/DefaultOptions.h
+++ b/Common/DefaultOptions.h
@@ -817,7 +817,7 @@ StringXNumber MeshOptions_Number[] = {
     "Display size of tangent vectors (in pixels)" }, 
 
   { F|O, "VertexArrays" , opt_mesh_vertex_arrays , 1. , 
-    "Use OpenGL vertex arrays to draw meshes?" },
+    "Use OpenGL vertex arrays to draw triangular meshes?" },
   { F|O, "VolumeEdges" , opt_mesh_volumes_edges , 1. , 
     "Display edges of volume mesh?" },
   { F|O, "VolumeFaces" , opt_mesh_volumes_faces , 0. , 
diff --git a/doc/texinfo/opt_general.texi b/doc/texinfo/opt_general.texi
index 2751cd6cc42faa786612fa5fd4be9a52c84492d1..49a3f94f9acb7f52c2bd67216e4eca0229053a48 100644
--- a/doc/texinfo/opt_general.texi
+++ b/doc/texinfo/opt_general.texi
@@ -36,7 +36,7 @@ Saved in: @code{General.SessionFileName}
 
 @item General.TextEditor
 System command to launch a text editor@*
-Default value: @code{"open -e %s"}@*
+Default value: @code{"emacs %s &"}@*
 Saved in: @code{General.OptionsFileName}
 
 @item General.TmpFileName
@@ -46,7 +46,7 @@ Saved in: @code{General.SessionFileName}
 
 @item General.WebBrowser
 System command to launch a web browser@*
-Default value: @code{"open %s"}@*
+Default value: @code{"if [[ $(ps -e|grep mozilla|grep -v grep) ]]; then mozilla -remote 'openurl(%s)' ; else mozilla %s ; fi &"}@*
 Saved in: @code{General.OptionsFileName}
 
 @item General.AlphaBlending
diff --git a/doc/texinfo/opt_geometry.texi b/doc/texinfo/opt_geometry.texi
index d11968ce42aa86e8783c22665ad01eb06632c66d..984a58300a51c2b939cbe0e7bf97b9f9642feae8 100644
--- a/doc/texinfo/opt_geometry.texi
+++ b/doc/texinfo/opt_geometry.texi
@@ -24,11 +24,6 @@ Number of control points for splines created during extrusion@*
 Default value: @code{5}@*
 Saved in: @code{General.OptionsFileName}
 
-@item Geometry.Highlight
-Not used@*
-Default value: @code{0}@*
-Saved in: @code{General.OptionsFileName}
-
 @item Geometry.Light
 Enable lighting for the geometry@*
 Default value: @code{1}@*
@@ -179,26 +174,6 @@ Selected geometry volume color@*
 Default value: @code{@{255,0,0@}}@*
 Saved in: @code{General.OptionsFileName}
 
-@item Geometry.Color.PointsHighlight
-Highlighted geometry point color@*
-Default value: @code{@{0,255,0@}}@*
-Saved in: @code{General.OptionsFileName}
-
-@item Geometry.Color.LinesHighlight
-Highlighted geometry curve color@*
-Default value: @code{@{0,0,255@}}@*
-Saved in: @code{General.OptionsFileName}
-
-@item Geometry.Color.SurfacesHighlight
-Highlighted geometry surface color@*
-Default value: @code{@{128,128,128@}}@*
-Saved in: @code{General.OptionsFileName}
-
-@item Geometry.Color.VolumesHighlight
-Highlighted geometry volume color@*
-Default value: @code{@{128,128,128@}}@*
-Saved in: @code{General.OptionsFileName}
-
 @item Geometry.Color.Tangents
 Tangent geometry vectors color@*
 Default value: @code{@{255,255,0@}}@*
diff --git a/doc/texinfo/opt_mesh.texi b/doc/texinfo/opt_mesh.texi
index 18bb3a519e7040d38c27efd510d57a1da4ec4b08..edb5f331d8a3f58e7594cfaff3b6c48e850d514a 100644
--- a/doc/texinfo/opt_mesh.texi
+++ b/doc/texinfo/opt_mesh.texi
@@ -69,11 +69,6 @@ Fourth cut plane equation coefficient (`D' in `AX+BY+CZ+D=0')@*
 Default value: @code{0}@*
 Saved in: @code{-}
 
-@item Mesh.DisplayLists
-Use OpenGL display lists for drawing meshes@*
-Default value: @code{0}@*
-Saved in: @code{General.OptionsFileName}
-
 @item Mesh.Dual
 Display the dual mesh obtained by barycentric subdivision@*
 Default value: @code{0}@*
@@ -269,6 +264,11 @@ Display size of tangent vectors (in pixels)@*
 Default value: @code{0}@*
 Saved in: @code{General.OptionsFileName}
 
+@item Mesh.VertexArrays
+Use OpenGL vertex arrays to draw triangular meshes?@*
+Default value: @code{1}@*
+Saved in: @code{General.OptionsFileName}
+
 @item Mesh.VolumeEdges
 Display edges of volume mesh?@*
 Default value: @code{1}@*