diff --git a/eo/src/eoOp.h b/eo/src/eoOp.h
index 5f8e46ea8..e1902a5d5 100644
--- a/eo/src/eoOp.h
+++ b/eo/src/eoOp.h
@@ -102,11 +102,12 @@ public:
   virtual string className() const {return "eoBinOp";};
 };
 
+// planning the change of name eoQuadraticOp --> eoQuadOp
+#define eoQuadraticOp eoQuadOp
+
 /** Quadratic genetic operator: subclasses eoOp, and defines basically the 
     operator() with two operands, both can be modified.
 */
-#define eoQuadraticOp eoQuadOp
-
 template<class EOType>
 class eoQuadraticOp: public eoOp<EOType>, public eoBF<EOType&, EOType&, void> {
 public:
@@ -116,15 +117,19 @@ public:
   virtual string className() const {return "eoQuadOp";};
 };
 
-// Turning an eoBinOp into an eoQuadOp is generic:
+/** Turning an eoQuadOp into an eoBinOp: simply don't touch the second arg!
+ */
 template <class EOT>
 class eoQuad2BinOp: public eoBinOp<EOT>
 {
 public:
-  // Ctor, from an eoQuadOp
+  /** Ctor
+   * @param _quadOp the eoQuadOp to be transformed
+   */
   eoQuad2BinOp(eoQuadOp<EOT> & _quadOp) : quadOp(_quadOp) {}
 
-  // Operator() simply calls embedded quadOp operator() with dummy second arg
+  /** Operator() simply calls embedded quadOp operator() with dummy second arg
+   */
   void operator()(EOT & _eo1, const EOT & _eo2)
   {
     EOT eoTmp = _eo2;		   // a copy that can be modified
diff --git a/eo/src/eoSGATransform.h b/eo/src/eoSGATransform.h
index 63bd462a7..a3237b9b7 100644
--- a/eo/src/eoSGATransform.h
+++ b/eo/src/eoSGATransform.h
@@ -37,7 +37,7 @@
 #include <utils/eoRNG.h>
 #include <eoTransform.h>
 
-/*****************************************************************************
+/** ***************************************************************************
  * eoSGATransform: transforms a population using genetic operators.
  * It does it exactly as class eoSGA, i.e. only accepts 
  *    quadratic crossover and unary mutation
@@ -90,7 +90,7 @@ template<class EOT> class eoSGATransform : public eoTransform<EOT>
   double mutationProba;
 };
 
-/*****************************************************************************
+/** ***************************************************************************
  * eoDynSGATransform: transforms a population using genetic operators.
  * It is the Dynamic version of the above eoSGATransform
  *    i.e. the operators probabilities can be passed as an eoValueParam, 
diff --git a/eo/src/eoVariableLengthCrossover.h b/eo/src/eoVariableLengthCrossover.h
index 20d073957..9e6aa72f5 100644
--- a/eo/src/eoVariableLengthCrossover.h
+++ b/eo/src/eoVariableLengthCrossover.h
@@ -39,7 +39,7 @@ Basically, they exchange genes - we need some matching information to apply
 atom crossover
 */
 
-//* A helper class for choosing which genes to exchange
+/** A helper class for choosing which genes to exchange */
 template <class Atom>
 class eoAtomExchange : public eoBF<unsigned, Atom &, bool>
 {
@@ -48,7 +48,7 @@ public:
   virtual void randomize(unsigned int, unsigned int){}
 };
 
-//* Uniform crossover - well, not really for FixedLength
+/** Uniform crossover - well, not really for FixedLength */
 template <class Atom>
 class eoUniformAtomExchange: public eoAtomExchange<Atom>
 {
diff --git a/eo/src/es/eoGenericRealOp.h b/eo/src/es/eoGenericRealOp.h
index c29fd1629..37596f520 100644
--- a/eo/src/es/eoGenericRealOp.h
+++ b/eo/src/es/eoGenericRealOp.h
@@ -47,10 +47,7 @@ MS January 25. 2001
 /** eoUniformMutation --> changes all values of the vector 
                           by uniform choice with range epsilon  
                           with probability p_change per variable
-\class eoUniformMutation eoRealOp.h Tutorial/eoRealOp.h
-\ingroup parameteric
 */
-
 template<class EOT> class eoGenericUniformMutation: public eoGenericMonOp<EOT>
 {
  public:
@@ -113,8 +110,6 @@ private:
 
 /** eoDetUniformMutation --> changes exactly k values of the vector 
                           by uniform choice with range epsilon  
-\class eoDetUniformMutation eoRealOp.h Tutorial/eoRealOp.h
-\ingroup parameteric
 */
 
 template<class EOT> class eoGenericDetUniformMutation: 
@@ -173,14 +168,10 @@ private:
 };
 
 
-// two arithmetical crossovers
 
 /** eoSegmentCrossover --> uniform choice in segment 
-                 == arithmetical with same value along all coordinates
-\class eoSegmentCrossover eoRealOp.h Tutorial/eoRealOp.h
-\ingroup parameteric
+       == arithmetical with same value along all coordinates
 */
-
 template<class EOT> class eoGenericSegmentCrossover: public eoGenericQuadOp<EOT>
 {
  public:
@@ -266,11 +257,8 @@ protected:
 };
   
 /** eoArithmeticCrossover --> uniform choice in hypercube  
-                 == arithmetical with different values for each coordinate
-\class eoArithmeticCrossover eoRealOp.h Tutorial/eoRealOp.h
-\ingroup parameteric
+      == arithmetical with different values for each coordinate
 */
-
 template<class EOT> class eoGenericArithmeticCrossover: 
   public eoGenericQuadOp<EOT>
 {
@@ -366,10 +354,7 @@ protected:
   
 
 /** eoRealUxOver --> Uniform crossover, also termed intermediate crossover
-\class eoRealUxOver eoRealOp.h Tutorial/eoRealOp.h
-\ingroup parameteric
 */
-
 template<class EOT> class eoGenericRealUxOver: public eoGenericQuadOp<EOT>
 {
  public: