diff --git a/DDG4/include/DDG4Python/DDPython.h b/DDG4/include/DDG4Python/DDPython.h
index 1e165431da44003324947a0d007d2de4cd2fe2c2..ab4a06220d0bdfa9b479defe7c02b2cf81aabdba 100644
--- a/DDG4/include/DDG4Python/DDPython.h
+++ b/DDG4/include/DDG4Python/DDPython.h
@@ -23,7 +23,12 @@ namespace DD4hep  {
 
   struct DDPythonGlobalState;
 
-  /** @class DDPython DDPython.h DDG4/DDPython.h  */
+  /// Python interface class for callbacks and GIL.
+  /**
+   *  \author  M.Frank
+   *  \version 1.0
+   *  \ingroup DD4HEP_SIMULATION
+   */
   class DDPython {
   private:
     void* context;
diff --git a/DDG4/include/DDG4Python/Geant4PythonAction.h b/DDG4/include/DDG4Python/Geant4PythonAction.h
index 5649770ad879efc5532ba527de0e47385af84a3c..8e6e3658e112bf62b7c8b95236f6fd5c3c094a9f 100644
--- a/DDG4/include/DDG4Python/Geant4PythonAction.h
+++ b/DDG4/include/DDG4Python/Geant4PythonAction.h
@@ -28,7 +28,7 @@ namespace DD4hep {
     /**
      *  \author  M.Frank
      *  \version 1.0
-     *  \ingroup DD4HEP_SIMULATION
+     *  \ingroup DD4HEP
      */
     class Geant4PythonAction : public Geant4Action   {
     public:
diff --git a/DDG4/include/DDG4Python/Geant4PythonInitialization.h b/DDG4/include/DDG4Python/Geant4PythonInitialization.h
index 3b64d9fb5850ccf4c5d6db85bf414690a9eeb5d5..e70a052b46bc8bef30de55e823721d650a4fbf7c 100644
--- a/DDG4/include/DDG4Python/Geant4PythonInitialization.h
+++ b/DDG4/include/DDG4Python/Geant4PythonInitialization.h
@@ -29,9 +29,9 @@ namespace DD4hep {
      *  Geant4PythonInitialization allows to configure python callbacks
      *  for the master and the worker thread setup using the calls:
      *
-     *     /// Set the Detector initialization command
+     *     // Set the Detector initialization command
      *     void setMasterSetup(PyObject* callable, PyObject* args);
-     *     /// Set the field initialization command
+     *     // Set the field initialization command
      *     void setWorkerSetup(PyObject* callable, PyObject* args);
      *
      *  or in python as a call sequence within the master thread:
diff --git a/cmake/DD4hep.cmake b/cmake/DD4hep.cmake
index dd7231fbcd830e208fcaae43fc596f19c4b113ff..a7701280dd7ab080b9164123d2de26e1c65fcc88 100644
--- a/cmake/DD4hep.cmake
+++ b/cmake/DD4hep.cmake
@@ -112,16 +112,23 @@ else()
 endif()
 
   set(libname ${CMAKE_SHARED_MODULE_PREFIX}${library}${CMAKE_SHARED_LIBRARY_SUFFIX})
-message(STATUS "DD4hep_DIR = ${DD4hep_DIR}" )
-  add_custom_command(OUTPUT ${rootmapfile}
+  #message(STATUS "DD4hep_DIR = ${DD4hep_DIR}" )
+  add_custom_command(TARGET ${library}
+                     POST_BUILD
                      COMMAND ${CMAKE_COMMAND} -Dlibname=${libname} -Drootmapfile=${rootmapfile}
                              -Dgenmap_install_dir=${LIBRARY_OUTPUT_PATH}
                              -DROOT_VERSION_MAJOR=${ROOT_VERSION_MAJOR}
                              -DDD4hep_DIR=${DD4hep_DIR}
-                             -P ${DD4hep_DIR}/cmake/MakeRootMap.cmake
-                     DEPENDS ${library})
-
-  add_custom_target(${library}Rootmap ALL DEPENDS ${rootmapfile})
+                             -P ${DD4hep_DIR}/cmake/MakeRootMap.cmake)
+
+  #add_custom_command(OUTPUT ${rootmapfile}
+  #                   COMMAND ${CMAKE_COMMAND} -Dlibname=${libname} -Drootmapfile=${rootmapfile}
+  #                           -Dgenmap_install_dir=${LIBRARY_OUTPUT_PATH}
+  #                           -DROOT_VERSION_MAJOR=${ROOT_VERSION_MAJOR}
+  #                           -DDD4hep_DIR=${DD4hep_DIR}
+  #                           -P ${DD4hep_DIR}/cmake/MakeRootMap.cmake
+  #                   DEPENDS ${library})
+  ##add_custom_target(${library}Rootmap ALL DEPENDS ${rootmapfile})
 
   install(FILES ${LIBRARY_OUTPUT_PATH}/${rootmapfile}
     DESTINATION lib
diff --git a/cmake/MakeRootMap.cmake b/cmake/MakeRootMap.cmake
index 47c6b621b9394b4850f30156c508fe1da54dc3cb..9eccc8591801b3ebe1740fc93f33a6c2793491b9 100644
--- a/cmake/MakeRootMap.cmake
+++ b/cmake/MakeRootMap.cmake
@@ -1,11 +1,11 @@
-message(STATUS "ROOT_genmap_CMD Root version: ${ROOT_VERSION_MAJOR} ${ROOT_VERSION}" )
+message(STATUS " *** ROOT_genmap[Root version: ${ROOT_VERSION_MAJOR}]: Generate map for ${libname} ..." )
 if( ${ROOT_VERSION_MAJOR} GREATER 5 )
   #
   #  Running listcomponents from Gaudi
   #
   FIND_PROGRAM( ROOT_genmap_CMD listcomponents PATHS ${genmap_install_dir}/../bin ${DD4hep_DIR}/bin )
-  ###MESSAGE( STATUS " *** MakeROOTMap ${genmap_install_dir}/../bin $ENV{DD4hep_DIR}/bin ${DD4hep_DIR}" )
-  MESSAGE( STATUS " *** MakeROOTMap[components].cmake run command : ${ROOT_genmap_CMD} -o ${rootmapfile} ${libname} 
+  ###MESSAGE( STATUS " *** MakeRootMap ${genmap_install_dir}/../bin $ENV{DD4hep_DIR}/bin ${DD4hep_DIR}" )
+  MESSAGE( STATUS " *** MakeRootMap[${ROOT_VERSION_MAJOR}].cmake run command : ${ROOT_genmap_CMD} -o ${rootmapfile} ${libname} 
                  WORKING_DIRECTORY ${genmap_install_dir} "
     )  
   if(APPLE)
@@ -24,7 +24,7 @@ else()
   #  Running genmap from ROOT 5
   #
   FIND_PROGRAM( ROOT_genmap_CMD genmap PATHS $ENV{ROOTSYS}/bin $ENV{PATH} )
-  MESSAGE( STATUS " *** MakeROOTMap.cmake run command : ${ROOT_genmap_CMD} -debug -i ${libname} -o ${rootmapfile}
+  MESSAGE( STATUS " *** MakeRootMap[${ROOT_VERSION_MAJOR}].cmake run command : ${ROOT_genmap_CMD} -debug -i ${libname} -o ${rootmapfile}
                  WORKING_DIRECTORY ${genmap_install_dir} "
     )