diff --git a/source/trunk/include/CLASSBackEnd.hxx b/source/trunk/include/CLASSBackEnd.hxx
index 9b355b04f35a64473d43efbbf9cc04170ed622c6..fb36d17d04999243bb5bd732cddb0d72758d75bd 100644
--- a/source/trunk/include/CLASSBackEnd.hxx
+++ b/source/trunk/include/CLASSBackEnd.hxx
@@ -25,6 +25,8 @@ using namespace std;
 typedef long long int cSecond;
 
 //-----------------------------------------------------------------------------//
+//! Class defining the common properties of all back end fuel cycle facilities
+
 /*!
  Define a CLASS Facility.
  The aim of these class is to gather all the commom properties of the
diff --git a/source/trunk/include/CLASSFacility.hxx b/source/trunk/include/CLASSFacility.hxx
index 96d4eccca8f0d8b2f682a529411c14de740fef9d..2ba95437c44a1ac0260393946cbbcd64fa29a523 100644
--- a/source/trunk/include/CLASSFacility.hxx
+++ b/source/trunk/include/CLASSFacility.hxx
@@ -23,6 +23,8 @@ typedef long long int cSecond;
 
 class Scenario;
 //-----------------------------------------------------------------------------//
+//! Defines the common properties of all facilities
+
 /*!
  Define a CLASS Facility.
  The aim of these class is to gather all the commom properties of the facilities.
diff --git a/source/trunk/include/CLASSFuel.hxx b/source/trunk/include/CLASSFuel.hxx
index d39826aa7d3afc0d4496777938ced2cc54b02cd8..89c3826e44075453bfe96dcbc5808875e1fdd8df 100644
--- a/source/trunk/include/CLASSFuel.hxx
+++ b/source/trunk/include/CLASSFuel.hxx
@@ -22,6 +22,8 @@
 using namespace std;
 
 //-----------------------------------------------------------------------------//
+//!  Allows to define PhysicsModels & EvolutionData as a CLASSFuel
+
 /*!
  Define a CLASS Object.
  The aim of these class is to handle PhysicsModels &
diff --git a/source/trunk/include/CLASSFuelPlan.hxx b/source/trunk/include/CLASSFuelPlan.hxx
index 17f0983b932ef5eb1163476e4f97cd4dc1a8b171..e0042f747cfad41759313b718df8f45f4175857a 100644
--- a/source/trunk/include/CLASSFuelPlan.hxx
+++ b/source/trunk/include/CLASSFuelPlan.hxx
@@ -24,6 +24,8 @@ typedef long long int cSecond;
 
 
 //-----------------------------------------------------------------------------//
+//! Allows a Reactor to change its CLASSFuel and/or burnup
+
 /*!
  Define a CLASS Object.
  The aim of these class is to allow a Reactor to change its CLASSFuel and/or burnup
diff --git a/source/trunk/include/CLASSLogger.hxx b/source/trunk/include/CLASSLogger.hxx
index 995650e2901f41d99f96c595f6373bfb3b89bf69..09ec4690a75cbca6067ca8713bc8e06d3fda91e5 100755
--- a/source/trunk/include/CLASSLogger.hxx
+++ b/source/trunk/include/CLASSLogger.hxx
@@ -47,6 +47,8 @@ using namespace std;
 #define _LOGTYPE_CLASS
 
 //-----------------------------------------------------------------------------//
+//!handle output stream in CLASS
+
 /*!
  Define a LogType.
  The aim of this class is to handle output stream in CLASS.
@@ -126,6 +128,8 @@ public:
 #define _CLASSLogger_CLASS_
 
 //-----------------------------------------------------------------------------//
+//! Object to handle output messages
+
 /*!
  Define a CLASSLogger.
  The aim of this class is to centralize the all CLASS software message inside a file.
diff --git a/source/trunk/include/CLASSNucleiFiliation.hxx b/source/trunk/include/CLASSNucleiFiliation.hxx
index 030c75561c1a66cdf650793316ca1eed65afb5fc..9f9452761c058b8ea1a2360234c763475840ccc1 100644
--- a/source/trunk/include/CLASSNucleiFiliation.hxx
+++ b/source/trunk/include/CLASSNucleiFiliation.hxx
@@ -12,6 +12,8 @@
 using namespace std;
 
 //-----------------------------------------------------------------------------//
+//! Handle connection between nuclei (decay/reaction)
+
 /*!
  Define a nuclei as : Z A I.
  The aim of this class is to discribe each CLASSNucleiFiliation. It connects nuclei to their daughter nuclei through a nuclear process using the correct branching ratio.
diff --git a/source/trunk/include/CLASSObject.hxx b/source/trunk/include/CLASSObject.hxx
index 062a9bb219c5dffe1695c497c06f0cd20084acb6..f18179731570bb0505d055e21fd6c75d5512349e 100644
--- a/source/trunk/include/CLASSObject.hxx
+++ b/source/trunk/include/CLASSObject.hxx
@@ -22,6 +22,8 @@
 using namespace std;
 
 //-----------------------------------------------------------------------------//
+//! Define common proporties of all objects
+
 /*!
  Define a CLASS Object.
  The aim of these class is to gather all the commom properties of all CLASS objects.
diff --git a/source/trunk/include/DecayDataBank.hxx b/source/trunk/include/DecayDataBank.hxx
index ac5eef7cd42da899c805069f93d6b38dc629d7f6..25842bf854af83125058d5fdc0484140ed0efdac 100644
--- a/source/trunk/include/DecayDataBank.hxx
+++ b/source/trunk/include/DecayDataBank.hxx
@@ -27,6 +27,8 @@ double ReactionRateWeightedDistance(IsotopicVector IV1, EvolutionData DB );
 double ReactionRateWeightedDistance(EvolutionData DB, IsotopicVector IV1  );
 
 //-----------------------------------------------------------------------------//
+//! Describe outcore radioactive decays 
+
 /*!
  Define a DecayDataBank.
  The aim of these class is to describe the evolution of "all" evoluting systems in CLASS.
diff --git a/source/trunk/include/EquivalenceModel.hxx b/source/trunk/include/EquivalenceModel.hxx
index e7d7288e9f8ee7fc85f65e8becd6e2f5f26d5fbd..60ecb6b2e51e55a71dbbb27fa2f96b1ec1767136 100644
--- a/source/trunk/include/EquivalenceModel.hxx
+++ b/source/trunk/include/EquivalenceModel.hxx
@@ -19,6 +19,8 @@
 using namespace std;
 
 //-----------------------------------------------------------------------------//
+
+//! Determines how to build a fresh fuel 
 /*!
  Define an EquivalenceModel.
  The aim of these class is to gather all the commum properties of all
diff --git a/source/trunk/include/EvolutionData.hxx b/source/trunk/include/EvolutionData.hxx
index cef1f37fe5cb6bdf322a5d65427fdb4f8f2be19c..4ec7c0b5b91dab062b6b704d9fe83ab52db9201f 100755
--- a/source/trunk/include/EvolutionData.hxx
+++ b/source/trunk/include/EvolutionData.hxx
@@ -35,6 +35,8 @@ double 	Distance(IsotopicVector IV1, EvolutionData Evd1 );
 double 	Distance(EvolutionData Evd1, IsotopicVector IV1 );
 
 //-----------------------------------------------------------------------------//
+//! Store fuel inventory evolution , mean cross sections evolution, flux evolution, power , ...
+
 /*!
  Define an EvolutionData.
  The aim of these class is to describe the evolution of a single evoluting system in CLASS.
diff --git a/source/trunk/include/FabricationPlant.hxx b/source/trunk/include/FabricationPlant.hxx
index fae39682fb1127892d3fe50e3c93b9044bee11a3..742229bab907d11b3cbc3e3fbce20075a582a4b3 100644
--- a/source/trunk/include/FabricationPlant.hxx
+++ b/source/trunk/include/FabricationPlant.hxx
@@ -26,6 +26,8 @@ using namespace std;
 typedef long long int cSecond;
 
 //-----------------------------------------------------------------------------//
+//! CLASS object to build the fresh fuel (do chemical separation) & store it until core loading
+
 /*!
  Define a FabricationPLant.
  The aim of these class is to manage the manufacturing of reprocessed fuel.
diff --git a/source/trunk/include/IrradiationModel.hxx b/source/trunk/include/IrradiationModel.hxx
index aaac53f7399676fa6edfb2e3c009bad463161472..6d87333ab22751325ea8880e2cd9b6408a653d30 100644
--- a/source/trunk/include/IrradiationModel.hxx
+++ b/source/trunk/include/IrradiationModel.hxx
@@ -31,6 +31,8 @@ typedef long long int cSecond;
 class ZAI;
 class CLASSLogger;
 //-----------------------------------------------------------------------------//
+//! The Bateman equation solver
+
 /*!
  Define an IrradiationModel.
  An IrradiationModel is a Bateman equation solving method.
diff --git a/source/trunk/include/IsotopicVector.hxx b/source/trunk/include/IsotopicVector.hxx
index 9e2aba115cd257c7357b3e3f5be4592fedd7c8e5..cf34887997d75586184998b48e6c2dc5ac10d96a 100755
--- a/source/trunk/include/IsotopicVector.hxx
+++ b/source/trunk/include/IsotopicVector.hxx
@@ -18,6 +18,8 @@ using namespace std;
 typedef long long int cSecond;
 
 //-----------------------------------------------------------------------------//
+//! Allows to store & operate on radioactive sample
+
 /*!
  Define an Isotopicvector.
  An isotopicVector is a map of ZAI and double (e.g number of atoms).
diff --git a/source/trunk/include/PhysicsModels.hxx b/source/trunk/include/PhysicsModels.hxx
index 7b858921425568df2312d1e721a39230df7422e4..93802e1488cd53ad14a11ab7b83e5bcef646b013 100644
--- a/source/trunk/include/PhysicsModels.hxx
+++ b/source/trunk/include/PhysicsModels.hxx
@@ -21,6 +21,8 @@ using namespace std;
 typedef long long int cSecond;
 
 //-----------------------------------------------------------------------------//
+//! Container object of XSModel, EquivalenceModel and IrradiationModel
+
 /*!
  Define a contener of all physics models used for a specific couple (reactor,fuel).
  
diff --git a/source/trunk/include/Pool.hxx b/source/trunk/include/Pool.hxx
index 151a79fb9534158efe84162a093592165bbe3812..cc068c3ba59886d341f7bb5ac47dbf49a065c362 100755
--- a/source/trunk/include/Pool.hxx
+++ b/source/trunk/include/Pool.hxx
@@ -20,8 +20,9 @@ class CLASSLogger;
 class DecayDataBank;
 
 //-----------------------------------------------------------------------------//
+//! Define the spent fuel pool
+
 /*!
- Define a Pool.
  This class deal with the management of the spent fuel pool
 
 
diff --git a/source/trunk/include/Reactor.hxx b/source/trunk/include/Reactor.hxx
index ddf7b9b6bd5d1726951c53a18d03da124f2b4fc9..ea213e8d71f801e4c357bb8ff4c966f487acf83c 100755
--- a/source/trunk/include/Reactor.hxx
+++ b/source/trunk/include/Reactor.hxx
@@ -26,8 +26,9 @@ class Storage;
 class CLASSLogger;
 
 //-----------------------------------------------------------------------------//
+//! Define the Reactor
+
 /*!
- Define a reactor.
  The aim of this class is to deal the evolution of the fuel inside a reactor.
  The fuel state in the reactor is describe in the IsotopicVector. Its evolution is contained in an EvolutionData
  
diff --git a/source/trunk/include/Scenario.hxx b/source/trunk/include/Scenario.hxx
index 236446210bbfa19710d435bbbc2a19047ca15104..8b3e83ecd85d5edf623cb55ddd78a34a235af80c 100755
--- a/source/trunk/include/Scenario.hxx
+++ b/source/trunk/include/Scenario.hxx
@@ -28,8 +28,9 @@ class Pool;
 class Storage;
 
 //-----------------------------------------------------------------------------//
+//!  Define a Scenario (the whole electro-nuclear system)
+
 /*!
- Define a Scenario .
  The aim of these Scenario is to manage the park and its evolution and to lead all Storage, FabricationPlant, Reactor, Pool,...
  
  
diff --git a/source/trunk/include/SeparationPlant.hxx b/source/trunk/include/SeparationPlant.hxx
index 612012ce65cf9c8119dcded1bc169dd2beb56765..8c396e4069c6adcd13f5fd8fb4550fcfd2786ed1 100644
--- a/source/trunk/include/SeparationPlant.hxx
+++ b/source/trunk/include/SeparationPlant.hxx
@@ -21,9 +21,10 @@ class CLASSLogger;
 class DecayDataBank;
 
 //-----------------------------------------------------------------------------//
+//!  Define a SeparationPlant.
+
 /*!
- Define a SeparationPlant.
- The aim of this class is to separate an IV into several IV (MA, Pu, PF, etc...) and 
+ The aim of this class is to separate an IV into several IV (MA, Pu, PF, etc...) and
  to send it to one or several Storage
 
  @author NT
diff --git a/source/trunk/include/Storage.hxx b/source/trunk/include/Storage.hxx
index eecb6bc963bd7dfa449652d9164dcd66037c9a29..2433b0141c93d9b63247540f79e67e63ea735b1a 100644
--- a/source/trunk/include/Storage.hxx
+++ b/source/trunk/include/Storage.hxx
@@ -20,8 +20,9 @@ class CLASSLogger;
 class DecayDataBank;
 
 //-----------------------------------------------------------------------------//
+//! Define a Storage object
+
 /*!
- Define a Storage object
  A Storage is a CLASSBackEnd facility. It is almost the same as a Pool with a
  infinite cooling time.
  A CLASSFacility can take IsotopicVector(s) contained in a Storage but a Storage 
diff --git a/source/trunk/include/XSModel.hxx b/source/trunk/include/XSModel.hxx
index c7b123eee13055d007f22c2560a2aeae328de386..4720a5fa9f16ab56f78d036be5c06eaa2624c408 100644
--- a/source/trunk/include/XSModel.hxx
+++ b/source/trunk/include/XSModel.hxx
@@ -19,8 +19,9 @@ using namespace std;
 class IsotopicVector;
 
 //-----------------------------------------------------------------------------//
+//!  Define a mean cross section predictor
+
 /*!
- Define a XS Interpolator 
 This is the mother class for methods related to XS prediction
 
 \warning
diff --git a/source/trunk/include/ZAI.hxx b/source/trunk/include/ZAI.hxx
index 632b4d94f951c0c93cca94c7964d3838f27be66a..c035e91adc4450dc98f153dcf82321e0bce40a11 100755
--- a/source/trunk/include/ZAI.hxx
+++ b/source/trunk/include/ZAI.hxx
@@ -13,6 +13,8 @@
 using namespace std;
 
 //-----------------------------------------------------------------------------//
+//! Define a nucleus
+
 /*!
  Define a nuclei as 3 integer Z,A,I:
  \li its charge number : Z
diff --git a/source/trunk/include/ZAIMass.hxx b/source/trunk/include/ZAIMass.hxx
index d4d84b1ac64fd018275a2bf77799848cd425be21..59bfeddb640654415990a9ccf67f0008c9cc8655 100644
--- a/source/trunk/include/ZAIMass.hxx
+++ b/source/trunk/include/ZAIMass.hxx
@@ -22,8 +22,9 @@ using namespace std;
 class IsotopicVector;
 
 //-----------------------------------------------------------------------------//
+//! Define the molar mass of a ZAI
+
 /*!
-Define a ZAIMass Object
  The aims of this class is to handle the molar mass of each ZAI
  
  @author BaM, BaL