diff --git a/tmva/tmva/inc/TMVA/PDEFoamCell.h b/tmva/tmva/inc/TMVA/PDEFoamCell.h
index 3c5e52eae5160e5a3fd563f6173837afef257b11..a0dd727749af180cdd0ba467d7ebb73add08f183 100644
--- a/tmva/tmva/inc/TMVA/PDEFoamCell.h
+++ b/tmva/tmva/inc/TMVA/PDEFoamCell.h
@@ -9,7 +9,7 @@
  *                                                                                *
  * Description:                                                                   *
  *      Objects of this class are hyperrectangular cells organized in             *
- *      the binary tree. Special algoritm for encoding relalive                   *
+ *      the binary tree. Special algoritm for encoding relative                   *
  *      positioning of the cells saves total memory allocation needed             *
  *      for the system of cells.                                                  *
  *                                                                                *
@@ -110,7 +110,7 @@ namespace TMVA {
       void Print(Option_t *option) const ;                   // Prints cell content
       //--- getter and setter for user variable ---
       void SetElement(TObject* fobj){ fElement = fobj; }     // Set user variable
-      TObject* GetElement() const { return fElement; }       // Get pointer to user varibale
+      TObject* GetElement() const { return fElement; }       // Get pointer to user variable
       ////////////////////////////////////////////////////////////////////////////
       ClassDef(PDEFoamCell,2)  //Single cell of FOAM
          }; // end of PDEFoamCell
diff --git a/tmva/tmva/inc/TMVA/PDEFoamDecisionTreeDensity.h b/tmva/tmva/inc/TMVA/PDEFoamDecisionTreeDensity.h
index c0d330268394a95f69cf9fd97f26f14d7407b5ae..f6ab9b45c12cb05abb48086f889565af02ab1565 100644
--- a/tmva/tmva/inc/TMVA/PDEFoamDecisionTreeDensity.h
+++ b/tmva/tmva/inc/TMVA/PDEFoamDecisionTreeDensity.h
@@ -61,7 +61,7 @@ namespace TMVA
       PDEFoamDecisionTreeDensity(const PDEFoamDecisionTreeDensity&);
       virtual ~PDEFoamDecisionTreeDensity() {}
 
-      // returns allways 0
+      // returns always 0
       virtual Double_t Density(std::vector<Double_t> &Xarg, Double_t &event_density);
 
       // fill histograms with events found in volume
diff --git a/tmva/tmva/src/PDEFoamCell.cxx b/tmva/tmva/src/PDEFoamCell.cxx
index fa6658bf3a056bd450df90f93992ce49e72e55d3..80516d073596c8cc1a439b15499edc5d89924c21 100644
--- a/tmva/tmva/src/PDEFoamCell.cxx
+++ b/tmva/tmva/src/PDEFoamCell.cxx
@@ -9,7 +9,7 @@
  *                                                                                *
  * Description:                                                                   *
  *      Objects of this class are hyperrectangular cells organized in             *
- *      the binary tree. Special algoritm for encoding relalive                   *
+ *      the binary tree. Special algoritm for encoding relative                   *
  *      positioning of the cells saves total memory allocation needed             *
  *      for the system of cells.                                                  *
  *                                                                                *
@@ -28,6 +28,10 @@
  * (http://tmva.sourceforge.net/LICENSE)                                          *
  **********************************************************************************/
 
+/*! \class TMVA::PDEFoamCell
+\ingroup TMVA
+
+*/
 #include "TMVA/PDEFoamCell.h"
 
 #include "TMVA/PDEFoamVect.h"
@@ -205,7 +209,7 @@ void TMVA::PDEFoamCell::CalcVolume(void)
 
 UInt_t TMVA::PDEFoamCell::GetDepth()
 {
-   // check wheter we are in the root cell
+   // check whether we are in the root cell
    if (fParent == 0)
       return 1;
 
diff --git a/tmva/tmva/src/PDEFoamDecisionTree.cxx b/tmva/tmva/src/PDEFoamDecisionTree.cxx
index eb23465c14a7ac20a00e562f403322bafc879baa..0b5528fdb419b9c6063eb0ec501de368a0f6889c 100644
--- a/tmva/tmva/src/PDEFoamDecisionTree.cxx
+++ b/tmva/tmva/src/PDEFoamDecisionTree.cxx
@@ -26,26 +26,24 @@
  * (http://tmva.sourceforge.net/LICENSE)                                          *
  **********************************************************************************/
 
-//_____________________________________________________________________
-//
-// PDEFoamDecisionTree
-//
-// This PDEFoam variant acts like a decision tree and stores in every
-// cell the discriminant
-//
-//    D = #events with given class / total number of events
-//
-// as well as the statistical error on the discriminant.  It therefore
-// acts as a discriminant estimator.  The decision tree-like behaviour
-// is achieved by overriding PDEFoamDiscriminant::Explore() to use a
-// decision tree-like cell splitting algorithm (given a separation
-// type).
-//
-// This PDEFoam variant should be booked together with the
-// PDEFoamDecisionTreeDensity density estimator, which returns the
-// events in a cell without sampling.
-//
-//_____________________________________________________________________
+/*! \class TMVA::PDEFoamDecisionTree
+\ingroup TMVA
+
+This PDEFoam variant acts like a decision tree and stores in every
+cell the discriminant
+
+     D = #events with given class / total number of events
+
+as well as the statistical error on the discriminant.  It therefore
+acts as a discriminant estimator.  The decision tree-like behaviour
+is achieved by overriding PDEFoamDiscriminant::Explore() to use a
+decision tree-like cell splitting algorithm (given a separation
+type).
+
+This PDEFoam variant should be booked together with the
+PDEFoamDecisionTreeDensity density estimator, which returns the
+events in a cell without sampling.
+*/
 
 #ifndef ROOT_TMVA_PDEFoamDecisionTree
 #include "TMVA/PDEFoamDecisionTree.h"
@@ -86,7 +84,7 @@ TMVA::PDEFoamDecisionTree::PDEFoamDecisionTree()
 /// - sepType - separation type used for the cell splitting (will be
 ///   deleted in the destructor)
 ///
-/// - cls - class to consider as signal when calcualting the purity
+/// - cls - class to consider as signal when calculating the purity
 
 TMVA::PDEFoamDecisionTree::PDEFoamDecisionTree(const TString& name, SeparationBase *sepType, UInt_t cls)
    : PDEFoamDiscriminant(name, cls)
@@ -125,7 +123,7 @@ TMVA::PDEFoamDecisionTree::~PDEFoamDecisionTree()
 /// this routine.
 ///
 /// Note, that according to the decision tree logic, a cell is only
-/// split, if the number of (unweighted) events in each dautghter
+/// split, if the number of (unweighted) events in each daughter
 /// cell is greater than fNmin.
 
 void TMVA::PDEFoamDecisionTree::Explore(PDEFoamCell *cell)
diff --git a/tmva/tmva/src/PDEFoamDecisionTreeDensity.cxx b/tmva/tmva/src/PDEFoamDecisionTreeDensity.cxx
index 8ef5050435267935ca5027afc4612dc73966166d..fca0767a9697ca329fd0bee5aa7c8c4f685b3317 100644
--- a/tmva/tmva/src/PDEFoamDecisionTreeDensity.cxx
+++ b/tmva/tmva/src/PDEFoamDecisionTreeDensity.cxx
@@ -31,14 +31,13 @@
  * (http://tmva.sourceforge.net/LICENSE)                                          *
  **********************************************************************************/
 
-//_____________________________________________________________________
-//
-// PDEFoamDecisionTreeDensity
-//
-// This is a concrete implementation of PDEFoam.  The Density(...)
-// function returns allways 0.  The function FillHistograms() is
-// added, which returns all events in a given TMVA::Volume.
-// _____________________________________________________________________
+/*! \class TMVA::PDEFoamDecisionTreeDensity
+\ingroup TMVA
+
+This is a concrete implementation of PDEFoam.  The Density(...)
+function returns allways 0.  The function FillHistograms() is
+added, which returns all events in a given TMVA::Volume.
+*/
 
 #include "TMVA/PDEFoamDecisionTreeDensity.h"
 
@@ -64,7 +63,7 @@ TMVA::PDEFoamDecisionTreeDensity::PDEFoamDecisionTreeDensity()
 {}
 
 ////////////////////////////////////////////////////////////////////////////////
-/// User construcor:
+/// User constructor:
 ///
 /// Parameters:
 ///
diff --git a/tmva/tmva/src/PDEFoamDensityBase.cxx b/tmva/tmva/src/PDEFoamDensityBase.cxx
index 37481c636b178dafccffcd8c2e2a3ef2f2aa4e73..d69b618feedb6853dacc037874bd64af3d8546e4 100644
--- a/tmva/tmva/src/PDEFoamDensityBase.cxx
+++ b/tmva/tmva/src/PDEFoamDensityBase.cxx
@@ -31,39 +31,38 @@
  * (http://tmva.sourceforge.net/LICENSE)                                          *
  **********************************************************************************/
 
-//_____________________________________________________________________
-//
-// PDEFoamDensityBase
-//
-// This is an abstract class, which provides an interface for a
-// PDEFoam density estimator.  Derived classes have to implement the
-// Density(...) function, which returns the density of a certain
-// quantity at a given phase-space point during the foam build-up.
-//
-// Variants of PDEFoamDensityBase are:
-//
-//   - PDEFoamEventDensity
-//   - PDEFoamDiscriminantDensity
-//   - PDEFoamTargetDensity
-//   - PDEFoamDecisionTreeDensity
-//
-// Usage:
-//
-// The user has to instantiate a child class of PDEFoamDensityBase and
-// set the pointer to the owner, which is a PDEFoam object:
-//
-//   PDEFoamDensityBase *dens = new MyDensity();
-//   pdefoam->SetDensity(dens);
-//
-// Afterwards the binary search tree should be filled with TMVA
-// events, by either using
-//
-//   pdefoam->FillBinarySearchTree(event);
-//
-// or
-//
-//   dens->FillBinarySearchTree(event);
-// _____________________________________________________________________
+/*! \class TMVA::PDEFoamDensityBase
+\ingroup TMVA
+
+This is an abstract class, which provides an interface for a
+PDEFoam density estimator.  Derived classes have to implement the
+Density(...) function, which returns the density of a certain
+quantity at a given phase-space point during the foam build-up.
+
+Variants of PDEFoamDensityBase are:
+
+  - PDEFoamEventDensity
+  - PDEFoamDiscriminantDensity
+  - PDEFoamTargetDensity
+  - PDEFoamDecisionTreeDensity
+
+Usage:
+
+The user has to instantiate a child class of PDEFoamDensityBase and
+set the pointer to the owner, which is a PDEFoam object:
+
+  PDEFoamDensityBase *dens = new MyDensity();
+  pdefoam->SetDensity(dens);
+
+Afterwards the binary search tree should be filled with TMVA
+events, by either using:
+
+     pdefoam->FillBinarySearchTree(event);
+
+or:
+
+     dens->FillBinarySearchTree(event);
+*/
 
 #include "TMVA/PDEFoamDensityBase.h"
 
diff --git a/tmva/tmva/src/PDEFoamDiscriminant.cxx b/tmva/tmva/src/PDEFoamDiscriminant.cxx
index b7ae1e1ef7c28683d1b523d1159a7cc3358ed8a3..c5e067bc9894516428628b278b5670a6fc95e2c8 100644
--- a/tmva/tmva/src/PDEFoamDiscriminant.cxx
+++ b/tmva/tmva/src/PDEFoamDiscriminant.cxx
@@ -26,21 +26,19 @@
  * (http://tmva.sourceforge.net/LICENSE)                                          *
  **********************************************************************************/
 
-//_____________________________________________________________________
-//
-// PDEFoamDiscriminant
-//
-// This PDEFoam variant stores in every cell the discriminant
-//
-//    D = #events with given class / total number of events
-//
-// as well as the statistical error on the discriminant.  It therefore
-// acts as a discriminant estimator.  It should be booked together
-// with the PDEFoamDiscriminantDensity density estimator, which
-// returns the discriminant density at a given phase space point
-// during the foam build-up.
-//
-//_____________________________________________________________________
+/*! \class TMVA::PDEFoamDiscriminant
+\ingroup TMVA
+
+This PDEFoam variant stores in every cell the discriminant
+
+     D = #events with given class / total number of events
+
+as well as the statistical error on the discriminant.  It therefore
+acts as a discriminant estimator.  It should be booked together
+with the PDEFoamDiscriminantDensity density estimator, which
+returns the discriminant density at a given phase space point
+during the foam build-up.
+*/
 
 #include "TMVA/PDEFoamDiscriminant.h"