diff --git a/DDSim/DD4hepSimulation.py b/DDSim/DD4hepSimulation.py
index 03b0117ef9f57968067c54b0fcb911b4a540070c..5ba6478181e757eddfe733083df6303bb99b6747 100644
--- a/DDSim/DD4hepSimulation.py
+++ b/DDSim/DD4hepSimulation.py
@@ -615,6 +615,9 @@ SIM = DD4hepSimulation()
         continue
       if isinstance( parameter, ConfigHelper ):
         steeringFileBase += "\n\n"
+        steeringFileBase += "################################################################################\n"
+        steeringFileBase += "## %s \n" % "\n## ".join( parameter.__doc__.splitlines() )
+        steeringFileBase += "################################################################################\n"
         options = parameter.getOptions()
         for opt,valAndDoc in options.iteritems():
           parValue, parDoc = valAndDoc
diff --git a/DDSim/Helper/Action.py b/DDSim/Helper/Action.py
index 686c794e7ac265cb2b55f5e302ca73213061bcb7..0fadf5efa7a895c1fa513a7798369aee849ec91a 100644
--- a/DDSim/Helper/Action.py
+++ b/DDSim/Helper/Action.py
@@ -1,26 +1,27 @@
 """Helper object for SD Actions
+"""
 
-The default tracker and calorimeter actions can be set with
+from DDSim.Helper.ConfigHelper import ConfigHelper
 
->>> SIM = DD4hepSimulation()
->>> SIM.action.tracker = "Geant4TrackerAction"
->>> SIM.action.tracker = "Geant4CalorimeterAction"
+class Action( ConfigHelper ):
+  """Action holding sensitive detector actions
+  The default tracker and calorimeter actions can be set with
 
-for specific subdetectors specific sensitive detectors can be set based on pattern matching
+  >>> SIM = DD4hepSimulation()
+  >>> SIM.action.tracker = "Geant4TrackerAction"
+  >>> SIM.action.tracker = "Geant4CalorimeterAction"
 
->>> SIM = DD4hepSimulation()
->>> SIM.action.mapActions['tpc'] = "TPCSDAction"
+  for specific subdetectors specific sensitive detectors can be set based on pattern matching
 
-and additional parameters for the sensitive detectors can be set when the map is given a tuple
+  >>> SIM = DD4hepSimulation()
+  >>> SIM.action.mapActions['tpc'] = "TPCSDAction"
 
->>> SIM = DD4hepSimulation()
->>> SIM.action.mapActions['ecal'] =( "CaloPreShowerSDAction", {"FirstLayerNumber": 1} )
-"""
+  and additional parameters for the sensitive detectors can be set when the map is given a tuple
 
-from DDSim.Helper.ConfigHelper import ConfigHelper
+  >>> SIM = DD4hepSimulation()
+  >>> SIM.action.mapActions['ecal'] =( "CaloPreShowerSDAction", {"FirstLayerNumber": 1} )
 
-class Action( ConfigHelper ):
-  """Action holding sensitive detector actions"""
+  """
   def __init__( self ):
     super(Action, self).__init__()
     self._tracker = 'Geant4TrackerAction'
@@ -47,7 +48,7 @@ class Action( ConfigHelper ):
   @property
   def mapActions( self ):
     """ create a map of patterns and actions to be applied to sensitive detectors
-    e.g. tpc --> TPCSDAction """
+        example: SIM.action.mapActions['tpc'] = "TPCSDAction" """
     return self._mapActions
 
   @mapActions.setter
diff --git a/DDSim/Helper/Filter.py b/DDSim/Helper/Filter.py
index 18705b64aa9b36dd290bcd21ae7e10173f3ba779..6846fa6548e1ba59b0a95b26a166bd2b3dd98d26 100644
--- a/DDSim/Helper/Filter.py
+++ b/DDSim/Helper/Filter.py
@@ -1,11 +1,6 @@
 """Helper object for Filters
 
->>> SIM = DD4hepSimulation()
->>> SIM.filter.mapDetFilter['FTD'] = "edep3keV"
->>> SIM.filter.filters['edep3keV'] = dict(name="EnergyDepositMinimumCut/3keV", parameter={"Cut": 3.0*keV} )
-
-
-Later the paramter dictionary is used to instantiate the filter object
+Later the parameter dictionary is used to instantiate the filter object
 The default filters are a GeantinoRejector and a 1keV minimum energy cut
 
 """
@@ -14,15 +9,47 @@ from DDSim.Helper.ConfigHelper import ConfigHelper
 from SystemOfUnits import keV
 
 class Filter( ConfigHelper ):
-  """Filter for sensitive detector actions"""
+  """Configuration for sensitive detector filters
+
+  Set the default filter for tracker or caliromter
+  >>> SIM.filter.tracker = "edep1kev"
+  >>> SIM.filter.calo = ""
+
+  Assign a filter to a sensitive detector via pattern matching
+  >>> SIM.filter.mapDetFilter['FTD'] = "edep1kev"
+
+  Or more than one filter:
+  >>> SIM.filter.mapDetFilter['FTD'] = ["edep1kev", "geantino"]
+
+  Create a custom filter. The dictionary is used to instantiate the filter later on
+  >>> SIM.filter.filters['edep3kev'] = dict(name="EnergyDepositMinimumCut/3keV", parameter={"Cut": 3.0*keV} )
+
+  """
   def __init__( self ):
     super(Filter, self).__init__()
     self._mapDetFilter = {}
-    self._tracker = "edep"
+    self._tracker = "edep1kev"
     self._calo    = None
     self._filters = {}
     self._createDefaultFilters()
 
+  @property
+  def tracker( self ):
+    """ default filter for tracking sensitive detectors """
+    return self._tracker
+  @tracker.setter
+  def tracker( self, val ):
+    self._tracker = val
+
+  @property
+  def calo( self ):
+    """ default filter for calorimeter sensitive detectors """
+    return self._calo
+  @calo.setter
+  def calo( self, val ):
+    self._calo = val
+
+
   @property
   def filters( self ):
     """ list of filter objects: map between name and parameter dictionary """
@@ -32,8 +59,8 @@ class Filter( ConfigHelper ):
     if isinstance(val, dict):
       self._filters.update(val)
       return
-    ## 
-    raise RuntimeError("Commandline setting of filters is not supported, use a steeringFile:%s " % val )
+    ##
+    raise RuntimeError("Commandline setting of filters is not supported, use a steeringFile: %s " % val )
 
 
   @property
diff --git a/DDSim/Helper/Gun.py b/DDSim/Helper/Gun.py
index 5db30c15803cf79afecd3d31517a434728e4d1f2..8fb4db5ca43766b560a6a5699aa5bf1f482d6019 100644
--- a/DDSim/Helper/Gun.py
+++ b/DDSim/Helper/Gun.py
@@ -4,7 +4,7 @@ from DDSim.Helper.ConfigHelper import ConfigHelper
 from SystemOfUnits import GeV
 
 class Gun( ConfigHelper ):
-  """Gun holding all gun properties"""
+  """Configuration for the DDG4 ParticleGun"""
   def __init__( self ):
     super(Gun, self).__init__()
     self.energy = 10*GeV
diff --git a/DDSim/Helper/MagneticField.py b/DDSim/Helper/MagneticField.py
index 73777dfa102736dd1b96e552c110c9a69538f10a..4a92c5170c9d73409a227ae3e81782962b94dde7 100644
--- a/DDSim/Helper/MagneticField.py
+++ b/DDSim/Helper/MagneticField.py
@@ -3,7 +3,7 @@ from SystemOfUnits import mm
 from DDSim.Helper.ConfigHelper import ConfigHelper
 
 class MagneticField( ConfigHelper ):
-  """MagneticField holding all field properties"""
+  """Configuration for the magnetic field (stepper)"""
   def __init__( self ):
     super(MagneticField, self).__init__()
     self.stepper = "HelixSimpleRunge"
diff --git a/DDSim/Helper/Output.py b/DDSim/Helper/Output.py
index f55c799ae78e65f9ba1e7fccbb2d366540ad764f..93aed328152fefe685ee253905fdebffcc92acf4 100644
--- a/DDSim/Helper/Output.py
+++ b/DDSim/Helper/Output.py
@@ -4,7 +4,7 @@ from DDSim.Helper.ConfigHelper import ConfigHelper
 from DDSim.DD4hepSimulation import outputLevel
 
 class Output( ConfigHelper ):
-  """Output holding all gun properties so we can easily overwrite them via command line magic"""
+  """Configuration for the output levels of DDG4 components"""
   def __init__( self ):
     super(Output, self).__init__()
     self._kernel = outputLevel('INFO')
diff --git a/DDSim/Helper/ParticleHandler.py b/DDSim/Helper/ParticleHandler.py
index a2f078286454b9059e8ae7b4dffbaa4fbb77d500..4f251ddaf3a9d141907cceda840098cfe2477a23 100644
--- a/DDSim/Helper/ParticleHandler.py
+++ b/DDSim/Helper/ParticleHandler.py
@@ -4,7 +4,7 @@ from SystemOfUnits import MeV
 from DDSim.Helper.ConfigHelper import ConfigHelper
 
 class ParticleHandler( ConfigHelper ):
-  """Gun holding all gun properties so we can easily overwrite them via command line magic"""
+  """Configuration for the Particle Handler/ MCTruth treatment"""
   def __init__( self ):
     super(ParticleHandler, self).__init__()
     self._saveProcesses = ['Decay']
@@ -15,7 +15,7 @@ class ParticleHandler( ConfigHelper ):
 
   @property
   def saveProcesses(self):
-    """List of processes to save, give as whitespace separated string in quotation marks"""
+    """List of processes to save, on command line give as whitespace separated string in quotation marks"""
     return self._saveProcesses
   @saveProcesses.setter
   def saveProcesses(self, stringVal):
diff --git a/DDSim/Helper/Random.py b/DDSim/Helper/Random.py
index 6f3102628083141d5a4d118cb36f7e48b970a7b9..7dc49e20a79ad594e206152ab84565388c21b9cc 100644
--- a/DDSim/Helper/Random.py
+++ b/DDSim/Helper/Random.py
@@ -3,7 +3,7 @@
 from DDSim.Helper.ConfigHelper import ConfigHelper
 
 class Random (ConfigHelper):
-  """Properties for random number generator"""
+  """Properties for the random number generator"""
   def __init__ (self):
     super(Random, self).__init__()
     self.seed = None