diff --git a/Geo/GEdge.cpp b/Geo/GEdge.cpp
index e642296861302d33b97652cbb787d5610ba18fc5..4d3a964c052665ca695aff7d91404956491d5e72 100644
--- a/Geo/GEdge.cpp
+++ b/Geo/GEdge.cpp
@@ -1,4 +1,4 @@
-// $Id: GEdge.cpp,v 1.50 2008-07-01 14:24:07 geuzaine Exp $
+// $Id: GEdge.cpp,v 1.51 2008-07-04 12:03:50 geuzaine Exp $
 //
 // Copyright (C) 1997-2008 C. Geuzaine, J.-F. Remacle
 //
@@ -142,7 +142,7 @@ GPoint GEdge::closestPoint(const SPoint3 & queryPoint) const
   return GPoint(0, 0, 0);
 }
 
-int GEdge::containsParam(double pt) const
+bool GEdge::containsParam(double pt) const
 {
   Range<double> rg = parBounds(0);
   return (pt >= rg.low() && pt <= rg.high());
diff --git a/Geo/GEdge.h b/Geo/GEdge.h
index 168b821ec6e4408429688e65f5770a8cc6023966..ae9eb9efb3cdf6456629825d038b74993463ad3b 100644
--- a/Geo/GEdge.h
+++ b/Geo/GEdge.h
@@ -52,13 +52,13 @@ class GEdge : public GEntity {
   void delFace(GFace *f);
 
   // get the dimension of the edge (1)
-  virtual int dim() const {return 1;}
+  virtual int dim() const { return 1; }
 
   // set the visibility flag
   virtual void setVisibility(char val, bool recursive=false);
 
   // true if the edge is a seam for the given face.
-  virtual int isSeam(GFace *face) const { return 0; }
+  virtual bool isSeam(GFace *face) const { return false; }
 
   // get the bounding box
   virtual SBoundingBox3d bounds() const;
@@ -76,7 +76,7 @@ class GEdge : public GEntity {
   virtual GPoint closestPoint(const SPoint3 & queryPoint) const;
 
   // true if the edge contains the given parameter
-  virtual int containsParam(double pt) const;
+  virtual bool containsParam(double pt) const;
 
   // get first derivative of edge at the given parameter
   virtual SVector3 firstDer(double par) const = 0;
@@ -128,7 +128,7 @@ class GEdge : public GEntity {
   virtual void resetMeshAttributes();
 
   // true if entity is periodic in the "dim" direction.
-  virtual bool periodic(int dim) const { return v0 == v1 ; }
+  virtual bool periodic(int dim) const { return v0 == v1; }
 
   struct {
     char Method;
diff --git a/Geo/GEntity.h b/Geo/GEntity.h
index 203c8a29d5a9828cea5454ce5b90ccac5d09d367..9ba7a03d542a77fb790e24c5eb9ecd8d0cdd6bd6 100644
--- a/Geo/GEntity.h
+++ b/Geo/GEntity.h
@@ -201,7 +201,7 @@ class GEntity {
   virtual ModelType getNativeType() const { return UnknownModel; }
 
   // get the native pointer of the particular representation
-  virtual void * getNativePtr() const { return 0; }
+  virtual void *getNativePtr() const { return 0; }
 
   // the model owning this entity
   GModel *model() const { return _model; }
diff --git a/Geo/GFace.cpp b/Geo/GFace.cpp
index 83ca1102f6e4b2303dbbeacbacb7a5fce25b0737..453172c0673d7cc692246cf260821e297e88cd55 100644
--- a/Geo/GFace.cpp
+++ b/Geo/GFace.cpp
@@ -1,4 +1,4 @@
-// $Id: GFace.cpp,v 1.66 2008-07-01 14:24:07 geuzaine Exp $
+// $Id: GFace.cpp,v 1.67 2008-07-04 12:03:50 geuzaine Exp $
 //
 // Copyright (C) 1997-2008 C. Geuzaine, J.-F. Remacle
 //
@@ -581,15 +581,15 @@ GPoint GFace::closestPoint(const SPoint3 & queryPoint, const double initialGuess
   return GPoint(0, 0, 0);
 }
 
-int GFace::containsParam(const SPoint2 &pt) const
+bool GFace::containsParam(const SPoint2 &pt) const
 {
   Range<double> uu = parBounds(0);
   Range<double> vv = parBounds(1);
   if((pt.x() >= uu.low() && pt.x() <= uu.high()) &&
      (pt.y() >= vv.low() && pt.y() <= vv.high()))
-    return 1;
+    return true;
   else
-    return 0;
+    return false;
 }
 
 bool GFace::buildRepresentationCross()
diff --git a/Geo/GFace.h b/Geo/GFace.h
index 35e83e8fa30ce0417ead70337d6377ea9ee27827..30acd580a86a3d3e6d66375b3ed9f0f0e351c156 100644
--- a/Geo/GFace.h
+++ b/Geo/GFace.h
@@ -126,7 +126,7 @@ class GFace : public GEntity
   virtual SPoint2 parFromPoint(const SPoint3 &) const;
 
   // true if the parameter value is interior to the face
-  virtual int containsParam(const SPoint2 &pt) const;
+  virtual bool containsParam(const SPoint2 &pt) const;
 
   // return the point on the face closest to the given point
   virtual GPoint closestPoint(const SPoint3 & queryPoint, const double initialGuess[2]) const;
diff --git a/Geo/GModel.h b/Geo/GModel.h
index 124cc7620ac7e973740275126f0d4140d2696146..cad077cc6311bef6bd19af0337d6f3f1457f56ec 100644
--- a/Geo/GModel.h
+++ b/Geo/GModel.h
@@ -66,13 +66,15 @@ class GModel
   // the fly if needed
   void _storeElementsInEntities(std::map<int, std::vector<MElement*> > &map);
 
-  // loop over all vertices connected to elements and associate geo entity
+  // loop over all vertices connected to elements and associate geo
+  // entity
   void _associateEntityWithMeshVertices();
 
   // entity that is currently being meshed (used for error reporting)
   GEntity *_currentMeshEntity;
 
-  // index of the current model
+  // index of the current model (in the static list of all loaded
+  // models)
   static int _current;
 
  protected:
diff --git a/Geo/OCCEdge.cpp b/Geo/OCCEdge.cpp
index 798dd975236ee54844ff489641625002b9e43a4d..c60f86e0b4bce324970f4b74c82c4d1a12aa09d2 100644
--- a/Geo/OCCEdge.cpp
+++ b/Geo/OCCEdge.cpp
@@ -1,4 +1,4 @@
-// $Id: OCCEdge.cpp,v 1.39 2008-07-03 17:06:02 geuzaine Exp $
+// $Id: OCCEdge.cpp,v 1.40 2008-07-04 12:03:50 geuzaine Exp $
 //
 // Copyright (C) 1997-2008 C. Geuzaine, J.-F. Remacle
 //
@@ -105,7 +105,7 @@ SPoint2 OCCEdge::reparamOnFace(GFace *face, double epar, int dir) const
 }
 
 // True if the edge is a seam for the given face
-int OCCEdge::isSeam(GFace *face) const
+bool OCCEdge::isSeam(GFace *face) const
 {
   const TopoDS_Face *s = (TopoDS_Face*) face->getNativePtr();
   BRepAdaptor_Surface surface(*s);
@@ -114,7 +114,7 @@ int OCCEdge::isSeam(GFace *face) const
   //  if(surface.IsUPeriodic() || surface.IsVPeriodic()){
   return BRep_Tool::IsClosed(c, *s);
   //  }
-  return 0;
+  // return false;
 }
 
 GPoint OCCEdge::point(double par) const
diff --git a/Geo/OCCEdge.h b/Geo/OCCEdge.h
index 4366a63f91e930e05095c2054b550c91660bfbcd..12f73975fccbf8f8a4fbcab854d9e2c9068d6f37 100644
--- a/Geo/OCCEdge.h
+++ b/Geo/OCCEdge.h
@@ -54,7 +54,7 @@ class OCCEdge : public GEdge {
   virtual int minimumDrawSegments () const;
   bool is3D() const { return !curve.IsNull(); }
   void setTrimmed(OCCFace *);
-  int isSeam(GFace *) const;
+  bool isSeam(GFace *) const;
 };
 
 #endif
diff --git a/Geo/fourierFace.cpp b/Geo/fourierFace.cpp
index 61da737eb62c7ce89064520a70dea552415300a5..e917d394383c1b55ecff4a521520d148f0d9209f 100644
--- a/Geo/fourierFace.cpp
+++ b/Geo/fourierFace.cpp
@@ -39,12 +39,12 @@ SPoint2 fourierFace::parFromPoint(const SPoint3 &p) const
   return SPoint2(u, v);
 }
 
-int fourierFace::containsParam(const SPoint2 &pt) const
+bool fourierFace::containsParam(const SPoint2 &pt) const
 {
   const double tol = 1.e-6;
-  if(pt[0] < 0. - tol || pt[0] > 1. + tol) return 0;
-  if(pt[1] < 0. - tol || pt[1] > 1. + tol) return 0;
-  return 1;
+  if(pt[0] < 0. - tol || pt[0] > 1. + tol) return false;
+  if(pt[1] < 0. - tol || pt[1] > 1. + tol) return false;
+  return true;
 }
 
 SVector3 fourierFace::normal(const SPoint2 &param) const
diff --git a/Geo/fourierFace.h b/Geo/fourierFace.h
index 8580a70c8530e7548e05ab8e74842ab33709f142..84269901057ac88be1df93315432075bea4a6ca0 100644
--- a/Geo/fourierFace.h
+++ b/Geo/fourierFace.h
@@ -19,7 +19,7 @@ class fourierFace : public GFace {
   Range<double> parBounds(int i) const; 
   virtual GPoint point(double par1, double par2) const; 
   virtual SPoint2 parFromPoint(const SPoint3 &p) const;
-  virtual int containsParam(const SPoint2 &pt) const; 
+  virtual bool containsParam(const SPoint2 &pt) const; 
   virtual SVector3 normal(const SPoint2 &param) const; 
   virtual GEntity::GeomType geomType() const;
   virtual Pair<SVector3,SVector3> firstDer(const SPoint2 &param) const;
diff --git a/Makefile b/Makefile
index 7e0f07a753fabc4bd2cafdb9a25e89b17fa708f2..45b835d0d58019e557404a732fae3a8a2dd0faab 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.488 2008-06-22 06:15:09 geuzaine Exp $
+# $Id: Makefile,v 1.489 2008-07-04 12:03:50 geuzaine Exp $
 #
 # Copyright (C) 1997-2008 C. Geuzaine, J.-F. Remacle
 #
@@ -163,15 +163,15 @@ nodepend:
 
 tag:
 	rm -f ${GMSH_VERSION_FILE}
-	echo "#define GMSH_MAJOR_VERSION ${GMSH_MAJOR_VERSION}" >  ${GMSH_VERSION_FILE}
+	echo "#define GMSH_MAJOR_VERSION ${GMSH_MAJOR_VERSION}" > ${GMSH_VERSION_FILE}
 	echo "#define GMSH_MINOR_VERSION ${GMSH_MINOR_VERSION}" >> ${GMSH_VERSION_FILE}
 	echo "#define GMSH_PATCH_VERSION ${GMSH_PATCH_VERSION}" >> ${GMSH_VERSION_FILE}
 	echo "#define GMSH_EXTRA_VERSION \"${GMSH_EXTRA_VERSION}\"" >> ${GMSH_VERSION_FILE}
-	echo "#define GMSH_VERSION  \"${GMSH_VERSION}\"" >> ${GMSH_VERSION_FILE}
-	echo "#define GMSH_DATE     \"`date`\""          >> ${GMSH_VERSION_FILE}
-	echo "#define GMSH_HOST     \"${HOSTNAME}\""     >> ${GMSH_VERSION_FILE}
-	echo "#define GMSH_PACKAGER \"`whoami`\""        >> ${GMSH_VERSION_FILE}
-	echo "#define GMSH_OS       \"${UNAME}\""        >> ${GMSH_VERSION_FILE}
+	echo "#define GMSH_VERSION       \"${GMSH_VERSION}\"" >> ${GMSH_VERSION_FILE}
+	echo "#define GMSH_DATE          \"`date`\"" >> ${GMSH_VERSION_FILE}
+	echo "#define GMSH_HOST          \"${HOSTNAME}\"" >> ${GMSH_VERSION_FILE}
+	echo "#define GMSH_PACKAGER      \"`whoami`\"" >> ${GMSH_VERSION_FILE}
+	echo "#define GMSH_OS            \"${UNAME}\"" >> ${GMSH_VERSION_FILE}
 	echo "#define GMSH_SHORT_LICENSE \"${GMSH_SHORT_LICENSE}\"" >> ${GMSH_VERSION_FILE}
 
 initialtag:
diff --git a/Post/PViewData.h b/Post/PViewData.h
index 6a06a496e365bfbbf417fad975fb63fb25edb78b..d73ef355d302d1c76739502f17dd1f04378f0f0b 100644
--- a/Post/PViewData.h
+++ b/Post/PViewData.h
@@ -87,7 +87,7 @@ class PViewData {
   // get the bounding box
   virtual SBoundingBox3d getBoundingBox(int step=-1) = 0;
 
-  // get the number of elements of a giveb type, for a given step
+  // get the number of elements of a given type, for a given step
   virtual int getNumScalars(int step=-1){ return 0; }
   virtual int getNumVectors(int step=-1){ return 0; }
   virtual int getNumTensors(int step=-1){ return 0; }
diff --git a/Post/PViewDataGModel.h b/Post/PViewDataGModel.h
index d76e3f4282d42ad1e4c265d2dfc69253e0199439..30189e325d9af0114910d81aba90b9ebe8354d1f 100644
--- a/Post/PViewDataGModel.h
+++ b/Post/PViewDataGModel.h
@@ -117,7 +117,7 @@ class stepData{
   }
 };
 
-// The data container using elements from a GModel.
+// The data container using elements from one or more GModel(s).
 class PViewDataGModel : public PViewData {
  public:
   enum DataType {