diff --git a/DDCore/include/XML/Evaluator.h b/DDCore/include/XML/Evaluator.h
index 677bf1458fdd7d48dc417f442bddf1646842b93e..8e611de9eff0e1039342e5aa98c664f8d5b01ad6 100644
--- a/DDCore/include/XML/Evaluator.h
+++ b/DDCore/include/XML/Evaluator.h
@@ -102,7 +102,6 @@ namespace XmlTools {
      * Lookup the dictionary for a string constant
      *
      * @param name name of the variable.
-     * @param value value assigned to the variable.
      */
     const char* getEnviron(const char* name);
     /**
diff --git a/DDCore/include/XML/Utilities.h b/DDCore/include/XML/Utilities.h
index 56b977836023ce3d85224ae3a2fe388a84548175..fc3b164d73bd89b910e410b85c17f12dcbba718c 100644
--- a/DDCore/include/XML/Utilities.h
+++ b/DDCore/include/XML/Utilities.h
@@ -23,18 +23,17 @@ namespace DD4hep {
     Geometry::Solid createShape(Geometry::LCDD& lcdd, const std::string& shape_type, XML::Element element);
 
 
-    /** Create an envelope volume that is placed into the world volume ( the parent volume of sdet) from an xml
-     *  element <envelope/> with child nodes <shape/> and optionally <position/> and <rotation/>. For special cases
-     *  no volume but an assembly can be created with <shape type="Assembly"/>.
+    /** Create an envelope volume that is placed into the world volume (the parent volume of sdet) from an xml
+     *  element \<envelope/\> with child nodes \<shape/\> and optionally \<position/\> and \<rotation/\>. For special cases
+     *  no volume but an assembly can be created with \<shape type="Assembly"/\>.
      *  Example: <br>
-     *  <p>
-     *  <envelope vis="ILD_ECALVis">
-     *    <shape type="PolyhedraRegular" numsides="8"  rmin="TPC_outer_radius+Ecal_Tpc_gap" rmax="Ecal_outer_radius"  
-     *	         dz="2.*TPC_Ecal_Hcal_barrel_halfZ"  material = "Air" />
-     *    <rotation x="0*deg" y="0*deg" z="90*deg-180*deg/8"/>
-     * </envelope>
-     * </p>
-     * 
+     @verbatim
+     <envelope vis="ILD_ECALVis">
+        <shape type="PolyhedraRegular" numsides="8"  rmin="TPC_outer_radius+Ecal_Tpc_gap" rmax="Ecal_outer_radius"
+	        dz="2.*TPC_Ecal_Hcal_barrel_halfZ"  material = "Air" />
+        <rotation x="0*deg" y="0*deg" z="90*deg-180*deg/8"/>
+     </envelope>
+     @endverbatim
      *  @author S.Lu DESY, F. Gaede CERN/DESY 
      *  @version $Id:$
      */
diff --git a/DDG4/include/DDG4/Geant4ParticleHandler.h b/DDG4/include/DDG4/Geant4ParticleHandler.h
index 63ab9eb3f17004fd2b87af396278e60d84b85341..803335b1fc54ea122c8082a6377c8de457fec32c 100644
--- a/DDG4/include/DDG4/Geant4ParticleHandler.h
+++ b/DDG4/include/DDG4/Geant4ParticleHandler.h
@@ -34,16 +34,16 @@ namespace DD4hep {
      *  Extract the relevant particle information during the simulation step.
      *
      *  This procedure works as follows:
-     *  -- At the beginning of the event generation the object registers itself as
+     *  - At the beginning of the event generation the object registers itself as
      *    Monte-Carlo truth handler to the event context.
-     *  -- At the begin of each track action a particle candidate is created and filled
-     *     with all properties known at this time.
-     *  -- At each stepping action a flag is set if the step produced secondaries.
-     *  -- Sensitive detectors call the MC truth handler if a hit was created.
+     *  - At the begin of each track action a particle candidate is created and filled
+     *    with all properties known at this time.
+     *  - At each stepping action a flag is set if the step produced secondaries.
+     *  - Sensitive detectors call the MC truth handler if a hit was created.
      *    This fact is remembered.
-     *  -- At the end of the tracking action a first decision is taken if the candidate is to be
+     *  - At the end of the tracking action a first decision is taken if the candidate is to be
      *    kept for the final record.
-     *  -- At the end of the event action finally all particles are reduced to the
+     *  - At the end of the event action finally all particles are reduced to the
      *    final record. This logic can be overridden by a user handler to be attached.
      *  .
      *  Any of these actions may be intercepted by a {\tt{Geant4UserParticleHandler}}
diff --git a/DDG4/include/DDG4/Geant4UIManager.h b/DDG4/include/DDG4/Geant4UIManager.h
index a7b42e1fb4e376368edc6dbfc60895d81259ddf2..f9b3be5f332112862fc1b1866a0dd1f60f10dd6c 100644
--- a/DDG4/include/DDG4/Geant4UIManager.h
+++ b/DDG4/include/DDG4/Geant4UIManager.h
@@ -37,10 +37,10 @@ namespace DD4hep {
      *
      *  Any type of commands may be put together, but the overall execution order
      *  is as follows:
-     *  1) Execution of the visualization setup (Property: SetupVIS)
-     *  2) Execution of the user interface setup (Property: SetupUI)
-     *  3) Execution of the macro file list (Property: Macros)
-     *  4) Execution of the command list (Property: Commands)
+     *  1. Execution of the visualization setup (Property: SetupVIS)
+     *  2. Execution of the user interface setup (Property: SetupUI)
+     *  3. Execution of the macro file list (Property: Macros)
+     *  4. Execution of the command list (Property: Commands)
      *
      *
      * \author  M.Frank
diff --git a/DDG4/plugins/Geant4XMLSetup.cpp b/DDG4/plugins/Geant4XMLSetup.cpp
index 6e348cef84f80439198441e1e554d31455c1ad5c..0d7743f67abf3d6819d9e7a6c294562bf91d6922 100644
--- a/DDG4/plugins/Geant4XMLSetup.cpp
+++ b/DDG4/plugins/Geant4XMLSetup.cpp
@@ -53,7 +53,7 @@ namespace DD4hep {
       }
     }
 
-    /// Set the properties of a Geant4 Action object from <properties/> XML subsection
+    /// Set the properties of a Geant4 Action object from \<properties/\> XML subsection
     template <typename T> static void _setProperties(const T& handle, xml_h& e)  {
       xml_comp_t action(e);
       // Now we set the object properties