diff --git a/eo/src/eoFlOrBinOp.h b/eo/src/eoFlOrBinOp.h
index 124ca4fd4..2dda394d4 100644
--- a/eo/src/eoFlOrBinOp.h
+++ b/eo/src/eoFlOrBinOp.h
@@ -109,7 +109,7 @@ public :
       }
 
     bool changed = false;
-    for ( unsigned i = 0; i < k; i++ ) // TODO: check that we don't do twice the same
+    for ( unsigned i = 0; i < k; i++ ) //! @todo check that we don't do twice the same
       {
 	unsigned where = eo::rng.random(_eo1.size());
 	bool changedHere = op( _eo1[where], _eo2[where] );
diff --git a/eo/src/eoFlOrQuadOp.h b/eo/src/eoFlOrQuadOp.h
index 1ad873c48..0e4b9a465 100644
--- a/eo/src/eoFlOrQuadOp.h
+++ b/eo/src/eoFlOrQuadOp.h
@@ -101,7 +101,7 @@ public :
       }
 
     bool changed = false;
-    for ( unsigned i = 0; i < k; i++ ) // TODO: check that we don't do twice the same
+    for ( unsigned i = 0; i < k; i++ ) //! @todo check that we don't do twice the same
       {
 	unsigned where = eo::rng.random(_eo1.size());
 	bool changedHere = op( _eo1[where], _eo2[where] );
diff --git a/eo/src/eoSTLFunctor.h b/eo/src/eoSTLFunctor.h
index 74c206036..ca8b9233e 100644
--- a/eo/src/eoSTLFunctor.h
+++ b/eo/src/eoSTLFunctor.h
@@ -113,6 +113,6 @@ class eoSTLBF : public std::binary_function<A1, A2, R>
     eoBF<A1, A2, R>& f;
 };
 
-// TODO: put automated wrappers here...
+//! @todo: put automated wrappers here...
 
 #endif
diff --git a/eo/src/eoVariableLengthCrossover.h b/eo/src/eoVariableLengthCrossover.h
index ff86c60f6..9d604ea87 100644
--- a/eo/src/eoVariableLengthCrossover.h
+++ b/eo/src/eoVariableLengthCrossover.h
@@ -251,7 +251,7 @@ public :
     } while ( ( (tmp1.size()<Min) || (tmp2.size()<Min) ||
 	      (tmp1.size()>Max) || (tmp2.size()>Max) )
 	      && (index<10000) );
-    // FIXME bad hardcoded limit, should use an algorithm that guarantee a correct size in a finite number of tries
+    //! @todo FIXME bad hardcoded limit, should use an algorithm that guarantee a correct size in a finite number of tries
     if (index >= 10000)
       {
           eo::log << eo::warnings << "Warning: impossible to generate individual of the right size in 10000 trials" << std::endl;
diff --git a/eo/src/es/eoCMABreed.h b/eo/src/es/eoCMABreed.h
index 1c998c426..d55ab2610 100644
--- a/eo/src/es/eoCMABreed.h
+++ b/eo/src/es/eoCMABreed.h
@@ -31,7 +31,7 @@
 
 #include <algorithm>
 
-/// TODO, handle bounds
+/// @todo handle bounds
 template <class FitT>
 class eoCMABreed : public eoBreed< eoVector<FitT, double> > {
     
diff --git a/eo/src/es/eoCMAInit.h b/eo/src/es/eoCMAInit.h
index b605cd990..bce9e5baf 100644
--- a/eo/src/es/eoCMAInit.h
+++ b/eo/src/es/eoCMAInit.h
@@ -32,7 +32,7 @@
 #include <eoVector.h>
 #include <es/CMAState.h>
 
-/// TODO, handle bounds
+/// @todo handle bounds
 template <class FitT>
 class eoCMAInit : public eoInit< eoVector<FitT, double> > {
     
diff --git a/eo/src/gp/parse_tree.h b/eo/src/gp/parse_tree.h
index ba4a38614..0e85b576f 100644
--- a/eo/src/gp/parse_tree.h
+++ b/eo/src/gp/parse_tree.h
@@ -181,9 +181,9 @@ template <class T> class parse_tree
 class subtree
 {
 
-/*
+/**
     a bit nasty way to use a pool allocator (which would otherwise use slooow new and delete)
-    TODO: use the std::allocator interface
+    @todo use the std::allocator interface
 */
 
 #if (defined(__GNUC__) || defined(_MSC_VER)) && !(defined(_MT) || defined(MACOSX) || defined(__APPLE__)) // not multithreaded (or MACOSX - J. Eggermont)
diff --git a/eo/src/utils/eoFileSnapshot.h b/eo/src/utils/eoFileSnapshot.h
index 7392c70a4..c9e58c746 100644
--- a/eo/src/utils/eoFileSnapshot.h
+++ b/eo/src/utils/eoFileSnapshot.h
@@ -43,7 +43,7 @@ Assumes that the parameters that are passed to the monitor
 A dir is created and one file per snapshot is created there -
 so you can later generate a movie!
 
-TODO: The counter is handled internally, but this should be changed
+@todo The counter is handled internally, but this should be changed
 so that you can pass e.g. an evalcounter (minor)
 
 I failed to templatize everything so that it can handle eoParam<std::vector<T> >
diff --git a/eo/src/utils/eoOStreamMonitor.cpp b/eo/src/utils/eoOStreamMonitor.cpp
index 073793d82..f47096d01 100644
--- a/eo/src/utils/eoOStreamMonitor.cpp
+++ b/eo/src/utils/eoOStreamMonitor.cpp
@@ -37,7 +37,8 @@ eoMonitor& eoOStreamMonitor::operator()(void)
     } // if firstime
 
     // ok, now the real saving. write out
-    /* TODO old verbose formatting, do we still need it?
+    //! @todo old verbose formatting, do we still need it?
+    /*
         for (iterator it = vec.begin (); it != vec.end (); ++it) {
             // name: value
             out << (*it)->longName () << ": " << (*it)->getValue () << std::endl;
diff --git a/eo/src/utils/eoParser.cpp b/eo/src/utils/eoParser.cpp
index baefc48fa..f6c81f14a 100644
--- a/eo/src/utils/eoParser.cpp
+++ b/eo/src/utils/eoParser.cpp
@@ -164,7 +164,7 @@ pair<bool, string> eoParser::getValue(eoParam& _param) const
         result.first = true;
         return result;
     }
-    // else (TODO: check environment, just long names)
+    //! @todo check environment, just long names
     return result;
 }
 
@@ -210,7 +210,7 @@ void eoParser::readFrom(istream& is)
                     string value;
 
                     if (equalLocation == str.end())
-		    { // TODO: it should be the next string
+		    { //! @todo it should be the next string
                         value = "";
 		    }
                     else