diff --git a/smp/doc/CMakeLists.txt b/smp/doc/CMakeLists.txt
index 71b9d7822..f4a85d336 100644
--- a/smp/doc/CMakeLists.txt
+++ b/smp/doc/CMakeLists.txt
@@ -11,7 +11,7 @@ if(DOXYGEN_FOUND)
         # Creating the custom target
         if(UNIX AND NOT ${CMAKE_VERBOSE_MAKEFILE})
             add_custom_target(doc-smp
-                COMMAND ${DOXYGEN_EXECUTABLE} ${SMP_DOC_CONFIG_FILE} 2> /dev/null > /dev/null
+                COMMAND ${DOXYGEN_EXECUTABLE} ${SMP_DOC_CONFIG_FILE} 
                 WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
         else(UNIX AND NOT ${CMAKE_VERBOSE_MAKEFILE})
             add_custom_target(doc-smp
diff --git a/smp/doc/index.h b/smp/doc/index.h
index 6e6ae3464..fde65787a 100644
--- a/smp/doc/index.h
+++ b/smp/doc/index.h
@@ -4,7 +4,7 @@
 
 ParadisEO-SMP for Symmetric MultiProcessing or Shared Memory Parallelism is a module for multicores computations on several algorithms proposed by ParadiseEO. By simply wrapping the algorithms, it allows you to refer only to the API of your algorithm instead of learning a new one.
 
-Different parallelism models are avaiable such as the Master / Slaves model or the Island Model.
+Different parallelism models are available such as the Master / Slaves Model or the Island Model.
 
 @section tutorials Tutorials
 
diff --git a/smp/doc/smp.doxyfile.cmake b/smp/doc/smp.doxyfile.cmake
index 8a917426f..c84c918eb 100644
--- a/smp/doc/smp.doxyfile.cmake
+++ b/smp/doc/smp.doxyfile.cmake
@@ -1296,7 +1296,7 @@ SKIP_FUNCTION_MACROS   = YES
 # If a tag file is not located in the directory in which doxygen 
 # is run, you must also specify the path to the tagfile here.
 
-TAGFILES               = @SMP_BIN_DIR@/doc/eo.doxytag=http://eodev.sourceforge.net/smp/doc/html
+TAGFILES               = @SMP_BIN_DIR@/doc/smp.doxytag=http://paradiseo.gforge.inria.fr/addon/smp/doc/index.html
 
 # When a file name is specified after GENERATE_TAGFILE, doxygen will create 
 # a tag file that is based on the input files it reads.
diff --git a/smp/src/PPExpander.h b/smp/src/PPExpander.h
index c44506b35..47c65827d 100644
--- a/smp/src/PPExpander.h
+++ b/smp/src/PPExpander.h
@@ -30,12 +30,16 @@ Contact: paradiseo-help@lists.gforge.inria.fr
 #ifndef SMP_PPE_H_
 #define SMP_PPE_H_
 
+namespace paradiseo
+{
+namespace smp
+{
+
 /** Parameter Pack Expansion: Utility file to expand parameter pack
 
 Utility file to expand parameter pack with the recursive method
 
 **/
-
 template<class... Arg> class Loop;
  
 template<class T, class... Arg>
@@ -63,4 +67,8 @@ public:
  
 };
 
+}
+
+}
+
 #endif
diff --git a/smp/src/islandNotifier.h b/smp/src/islandNotifier.h
index 630d058ec..8a804f7f4 100644
--- a/smp/src/islandNotifier.h
+++ b/smp/src/islandNotifier.h
@@ -32,6 +32,11 @@ Contact: paradiseo-help@lists.gforge.inria.fr
 
 #include <utility>
 
+namespace paradiseo
+{
+namespace smp
+{
+
 /** IslandNotifier: The notifier will perform the binded task each generation.
 
 The island notifier makes the binded task executed by the island which observes.
@@ -39,12 +44,6 @@ We can imagine that a continuator checks if we have to execute the binded task.
 At the moment, the task is performed each generation.
 
 */
-
-namespace paradiseo
-{
-namespace smp
-{
-
 template <class EOT>
 class IslandNotifier : public eoUpdater
 {
diff --git a/smp/src/notifier.h b/smp/src/notifier.h
index 25a001c24..613950eee 100644
--- a/smp/src/notifier.h
+++ b/smp/src/notifier.h
@@ -33,15 +33,16 @@ Contact: paradiseo-help@lists.gforge.inria.fr
 #include <utils/eoUpdater.h>
 #include <functional>
 
-/** Notifier: The notifier will perform the binded task each generation.
-
-*/
-
 namespace paradiseo
 {
 namespace smp
 {
 
+/** 
+
+Notifier: The notifier will perform the binded task each generation.
+
+*/
 class Notifier : public eoUpdater
 {
 public :