diff --git a/Framework/Cascade/Cascade.dox b/Framework/Cascade/Cascade.dox
new file mode 100644
index 0000000000000000000000000000000000000000..7ea74e9c5f48191e010effd294c741494239b7c6
--- /dev/null
+++ b/Framework/Cascade/Cascade.dox
@@ -0,0 +1,8 @@
+/**
+
+
+  Here are have to explain the corsika::cascade::Cascade class and its
+  functionality.
+  
+
+*/
\ No newline at end of file
diff --git a/Framework/Geometry/BaseTrajectory.h b/Framework/Geometry/BaseTrajectory.h
index d8cf7ff5633de7847db2ede94634346048af08bb..eb04eed3d1f4f18cbc37dbe47aa05d3a8fb57918 100644
--- a/Framework/Geometry/BaseTrajectory.h
+++ b/Framework/Geometry/BaseTrajectory.h
@@ -9,15 +9,6 @@
  * the license.
  */
 
-/*
- * (c) Copyright 2018 CORSIKA Project, corsika-project@lists.kit.edu
- *
- * See file AUTHORS for a list of contributors.
- *
- * This software is distributed under the terms of the GNU General Public
- * Licence version 3 (GPL Version 3). See file LICENSE for a full version of
- * the license.
- */
 
 #ifndef _include_BASETRAJECTORY_H
 #define _include_BASETRAJECTORY_H
diff --git a/Framework/Geometry/BaseVector.h b/Framework/Geometry/BaseVector.h
index 106fb632446f476913bb93b01e085912182ebb1e..4395fb2ae855504740a5be52e7cd23e0bb8b67cc 100644
--- a/Framework/Geometry/BaseVector.h
+++ b/Framework/Geometry/BaseVector.h
@@ -9,15 +9,6 @@
  * the license.
  */
 
-/*
- * (c) Copyright 2018 CORSIKA Project, corsika-project@lists.kit.edu
- *
- * See file AUTHORS for a list of contributors.
- *
- * This software is distributed under the terms of the GNU General Public
- * Licence version 3 (GPL Version 3). See file LICENSE for a full version of
- * the license.
- */
 
 #ifndef _include_BASEVECTOR_H_
 #define _include_BASEVECTOR_H_
diff --git a/Framework/Geometry/CoordinateSystem.cc b/Framework/Geometry/CoordinateSystem.cc
index 6f818462b0399f7026864d7de3fc8da6aba877c9..180062609a46336e8ef80be1f13eed5b1a6b0b19 100644
--- a/Framework/Geometry/CoordinateSystem.cc
+++ b/Framework/Geometry/CoordinateSystem.cc
@@ -9,15 +9,6 @@
  * the license.
  */
 
-/*
- * (c) Copyright 2018 CORSIKA Project, corsika-project@lists.kit.edu
- *
- * See file AUTHORS for a list of contributors.
- *
- * This software is distributed under the terms of the GNU General Public
- * Licence version 3 (GPL Version 3). See file LICENSE for a full version of
- * the license.
- */
 
 #include <corsika/geometry/CoordinateSystem.h>
 #include <stdexcept>
diff --git a/Framework/Geometry/FourVector.h b/Framework/Geometry/FourVector.h
index 1cd15c6afc2f0fa4e21bb1168f2fdb8211078b25..dc4c61e6ec6d9bd8d739398650ced51dffefa81e 100644
--- a/Framework/Geometry/FourVector.h
+++ b/Framework/Geometry/FourVector.h
@@ -9,15 +9,6 @@
  * the license.
  */
 
-/*
- * (c) Copyright 2018 CORSIKA Project, corsika-project@lists.kit.edu
- *
- * See file AUTHORS for a list of contributors.
- *
- * This software is distributed under the terms of the GNU General Public
- * Licence version 3 (GPL Version 3). See file LICENSE for a full version of
- * the license.
- */
 
 #ifndef _include_corsika_framework_geometry_fourvector_h_
 #define _include_corsika_framework_geometry_fourvector_h_
diff --git a/Framework/Geometry/Helix.h b/Framework/Geometry/Helix.h
index 4d9badf8c757721507613a5abb1c4257dbe3ae0b..45d1d72a05fd5f62aa78d7bd940d2d32241769b5 100644
--- a/Framework/Geometry/Helix.h
+++ b/Framework/Geometry/Helix.h
@@ -9,15 +9,6 @@
  * the license.
  */
 
-/*
- * (c) Copyright 2018 CORSIKA Project, corsika-project@lists.kit.edu
- *
- * See file AUTHORS for a list of contributors.
- *
- * This software is distributed under the terms of the GNU General Public
- * Licence version 3 (GPL Version 3). See file LICENSE for a full version of
- * the license.
- */
 
 #ifndef _include_HELIX_H_
 #define _include_HELIX_H_
diff --git a/Framework/Geometry/Line.h b/Framework/Geometry/Line.h
index 8672aa178ecbc2bcc9dffd199d2348db0f9e86d4..fbd227c18e1ae9fc739458162b9870e0c4398461 100644
--- a/Framework/Geometry/Line.h
+++ b/Framework/Geometry/Line.h
@@ -9,15 +9,6 @@
  * the license.
  */
 
-/*
- * (c) Copyright 2018 CORSIKA Project, corsika-project@lists.kit.edu
- *
- * See file AUTHORS for a list of contributors.
- *
- * This software is distributed under the terms of the GNU General Public
- * Licence version 3 (GPL Version 3). See file LICENSE for a full version of
- * the license.
- */
 
 #ifndef _include_LINETRAJECTORY_H
 #define _include_LINETRAJECTORY_H
diff --git a/Framework/Geometry/RootCoordinateSystem.h b/Framework/Geometry/RootCoordinateSystem.h
index b5f496aa48e2e5ee0c89aba0c84e39b4df1fbd67..e10690b5c12da58fcc689e8342c3ab57322bfc76 100644
--- a/Framework/Geometry/RootCoordinateSystem.h
+++ b/Framework/Geometry/RootCoordinateSystem.h
@@ -9,15 +9,6 @@
  * the license.
  */
 
-/*
- * (c) Copyright 2018 CORSIKA Project, corsika-project@lists.kit.edu
- *
- * See file AUTHORS for a list of contributors.
- *
- * This software is distributed under the terms of the GNU General Public
- * Licence version 3 (GPL Version 3). See file LICENSE for a full version of
- * the license.
- */
 
 #ifndef _include_corsika_geometry_rootcoordinatesystem_h_
 #define _include_corsika_geometry_rootcoordinatesystem_h_
diff --git a/Framework/Geometry/Sphere.h b/Framework/Geometry/Sphere.h
index 01d74543ec4407dc5a3acc12edee73c92c8d1504..c2fc6b0fb60d8a2d9c07a8379e5f93132125088e 100644
--- a/Framework/Geometry/Sphere.h
+++ b/Framework/Geometry/Sphere.h
@@ -9,15 +9,6 @@
  * the license.
  */
 
-/*
- * (c) Copyright 2018 CORSIKA Project, corsika-project@lists.kit.edu
- *
- * See file AUTHORS for a list of contributors.
- *
- * This software is distributed under the terms of the GNU General Public
- * Licence version 3 (GPL Version 3). See file LICENSE for a full version of
- * the license.
- */
 
 #ifndef _include_SPHERE_H_
 #define _include_SPHERE_H_
diff --git a/Framework/Geometry/Trajectory.h b/Framework/Geometry/Trajectory.h
index 69bcfd6f8ad6a8ea4314531c48865e06179bbe91..4b2a7f76c5cf00949c3bbfb5377028f12df1229a 100644
--- a/Framework/Geometry/Trajectory.h
+++ b/Framework/Geometry/Trajectory.h
@@ -9,15 +9,6 @@
  * the license.
  */
 
-/*
- * (c) Copyright 2018 CORSIKA Project, corsika-project@lists.kit.edu
- *
- * See file AUTHORS for a list of contributors.
- *
- * This software is distributed under the terms of the GNU General Public
- * Licence version 3 (GPL Version 3). See file LICENSE for a full version of
- * the license.
- */
 
 #ifndef _include_TRAJECTORY_H
 #define _include_TRAJECTORY_H
diff --git a/Framework/Geometry/Volume.h b/Framework/Geometry/Volume.h
index 95306edca53ff546b54fe362babbdcf17a73334c..80f4a572b8b7a8820c1cdc6b9b7d13874c323288 100644
--- a/Framework/Geometry/Volume.h
+++ b/Framework/Geometry/Volume.h
@@ -9,15 +9,6 @@
  * the license.
  */
 
-/*
- * (c) Copyright 2018 CORSIKA Project, corsika-project@lists.kit.edu
- *
- * See file AUTHORS for a list of contributors.
- *
- * This software is distributed under the terms of the GNU General Public
- * Licence version 3 (GPL Version 3). See file LICENSE for a full version of
- * the license.
- */
 
 #ifndef _include_VOLUME_H_
 #define _include_VOLUME_H_
diff --git a/Framework/Geometry/testFourVector.cc b/Framework/Geometry/testFourVector.cc
index 824426aad0bdaa4173fff93b26486d1eb423fea6..9e9b303fd7ebfd4197585246c9433ad3192633c9 100644
--- a/Framework/Geometry/testFourVector.cc
+++ b/Framework/Geometry/testFourVector.cc
@@ -9,15 +9,6 @@
  * the license.
  */
 
-/*
- * (c) Copyright 2018 CORSIKA Project, corsika-project@lists.kit.edu
- *
- * See file AUTHORS for a list of contributors.
- *
- * This software is distributed under the terms of the GNU General Public
- * Licence version 3 (GPL Version 3). See file LICENSE for a full version of
- * the license.
- */
 
 #define CATCH_CONFIG_MAIN // This tells Catch to provide a main() - only do this in one
                           // cpp file
diff --git a/Framework/Particles/ParticleProperties.cc b/Framework/Particles/ParticleProperties.cc
index d59846fcf207e9c8a04c0f763bcbad4d5bfbe732..a9340f72252e977c85107b7943b6a16d3e0b584a 100644
--- a/Framework/Particles/ParticleProperties.cc
+++ b/Framework/Particles/ParticleProperties.cc
@@ -9,15 +9,6 @@
  * the license.
  */
 
-/*
- * (c) Copyright 2018 CORSIKA Project, corsika-project@lists.kit.edu
- *
- * See file AUTHORS for a list of contributors.
- *
- * This software is distributed under the terms of the GNU General Public
- * Licence version 3 (GPL Version 3). See file LICENSE for a full version of
- * the license.
- */
 
 #include <corsika/particles/ParticleProperties.h>
 #include <iostream>
diff --git a/Framework/StackInterface/SecondaryView.h b/Framework/StackInterface/SecondaryView.h
index 0993edd98e211457976905bae849e901c045c6f7..ac2e3ed19e462ecaca7e7def0bfd2abcb58e31ac 100644
--- a/Framework/StackInterface/SecondaryView.h
+++ b/Framework/StackInterface/SecondaryView.h
@@ -1,3 +1,14 @@
+
+/*
+ * (c) Copyright 2018 CORSIKA Project, corsika-project@lists.kit.edu
+ *
+ * See file AUTHORS for a list of contributors.
+ *
+ * This software is distributed under the terms of the GNU General Public
+ * Licence version 3 (GPL Version 3). See file LICENSE for a full version of
+ * the license.
+ */
+
 #ifndef _include_corsika_stack_secondaryview_h_
 #define _include_corsika_stack_secondaryview_h_
 
diff --git a/Framework/StackInterface/testTestStack.h b/Framework/StackInterface/testTestStack.h
index a3bf63466ac11b507b3cdf71dde77322d74b17ed..b086994cc530544c01af66d34b46ac61046ee097 100644
--- a/Framework/StackInterface/testTestStack.h
+++ b/Framework/StackInterface/testTestStack.h
@@ -1,3 +1,14 @@
+
+/*
+ * (c) Copyright 2018 CORSIKA Project, corsika-project@lists.kit.edu
+ *
+ * See file AUTHORS for a list of contributors.
+ *
+ * This software is distributed under the terms of the GNU General Public
+ * Licence version 3 (GPL Version 3). See file LICENSE for a full version of
+ * the license.
+ */
+
 #ifndef _include_corsika_stack_testTestStack_h_
 #define _include_corsika_stack_testTestStack_h_
 
diff --git a/Framework/Units/PhysicalConstants.h b/Framework/Units/PhysicalConstants.h
index 1bf9872a03ed3abee9bcb03ef93fd24250f14a50..8619d3c4164dd54543f7fbc30faeb0cd5730d81f 100644
--- a/Framework/Units/PhysicalConstants.h
+++ b/Framework/Units/PhysicalConstants.h
@@ -1,25 +1,12 @@
-/**
- * \file PhysicalConstants
- *
- * \brief   Several physical constants.
- * \author  Michael S. Kenniston, Martin Moene
- * \date    7 September 2013
- * \since   0.4
- *
- * Copyright 2013 Universiteit Leiden. All rights reserved.
- *
- * Copyright (c) 2001 by Michael S. Kenniston.  For the most
- * recent version check www.xnet.com/~msk/quantity.  Permission is granted
- * to use this code without restriction so long as this copyright
- * notice appears in all source files.
- *
- * This code is provided as-is, with no warrantee of correctness.
- *
- * Distributed under the Boost Software License, Version 1.0. (See accompanying
- * file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
- *
+
+/*
+ * (c) Copyright 2018 CORSIKA Project, corsika-project@lists.kit.edu
  *
+ * See file AUTHORS for a list of contributors.
  *
+ * This software is distributed under the terms of the GNU General Public
+ * Licence version 3 (GPL Version 3). See file LICENSE for a full version of
+ * the license.
  */
 
 #ifndef INCLUDE_PHYSICAL_CONSTANTS_H
diff --git a/Framework/Units/PhysicalUnits.h b/Framework/Units/PhysicalUnits.h
index af4dbb966aaaf5dfe5bfe7ace9619c9d299e94c7..786044aef3055b1472e0150dd451fa5050628f4b 100644
--- a/Framework/Units/PhysicalUnits.h
+++ b/Framework/Units/PhysicalUnits.h
@@ -1,3 +1,14 @@
+
+/*
+ * (c) Copyright 2018 CORSIKA Project, corsika-project@lists.kit.edu
+ *
+ * See file AUTHORS for a list of contributors.
+ *
+ * This software is distributed under the terms of the GNU General Public
+ * Licence version 3 (GPL Version 3). See file LICENSE for a full version of
+ * the license.
+ */
+
 #ifndef _include_PhysicalUnits_h_
 #define _include_PhysicalUnits_h_
 
diff --git a/Framework/Utilities/CorsikaFenvOSX.cc b/Framework/Utilities/CorsikaFenvOSX.cc
index 1028c4b7e0988bb7ced605f71990c9c9f344fbbc..4495ebd1e823ad5a9a1b894d07c09ae8f842d068 100644
--- a/Framework/Utilities/CorsikaFenvOSX.cc
+++ b/Framework/Utilities/CorsikaFenvOSX.cc
@@ -1,3 +1,14 @@
+
+/*
+ * (c) Copyright 2018 CORSIKA Project, corsika-project@lists.kit.edu
+ *
+ * See file AUTHORS for a list of contributors.
+ *
+ * This software is distributed under the terms of the GNU General Public
+ * Licence version 3 (GPL Version 3). See file LICENSE for a full version of
+ * the license.
+ */
+
 /**
  * Import public domain code
  *
diff --git a/Processes/Sibyll/NuclearInteraction.h b/Processes/Sibyll/NuclearInteraction.h
index 7b7492d4c335477e196116f003e405d3829177bd..86fa97addd890937c01c318ab55ecfc08f90a5b0 100644
--- a/Processes/Sibyll/NuclearInteraction.h
+++ b/Processes/Sibyll/NuclearInteraction.h
@@ -1,5 +1,5 @@
 
-/**
+/*
  * (c) Copyright 2018 CORSIKA Project, corsika-project@lists.kit.edu
  *
  * See file AUTHORS for a list of contributors.
@@ -9,6 +9,7 @@
  * the license.
  */
 
+
 #ifndef _corsika_process_sibyll_nuclearinteraction_h_
 #define _corsika_process_sibyll_nuclearinteraction_h_
 
diff --git a/Processes/Sibyll/nuclib.h b/Processes/Sibyll/nuclib.h
index 8653b2cc2aae811f330cd54f1d058456da4742f3..86a2a8f82a793cf49284794ec6f1cddced45bf48 100644
--- a/Processes/Sibyll/nuclib.h
+++ b/Processes/Sibyll/nuclib.h
@@ -1,5 +1,5 @@
 
-/**
+/*
  * (c) Copyright 2018 CORSIKA Project, corsika-project@lists.kit.edu
  *
  * See file AUTHORS for a list of contributors.
@@ -9,6 +9,7 @@
  * the license.
  */
 
+
 #ifndef _include_nuclib_interface_h_
 #define _include_nuclib_interface_h_
 
diff --git a/Setup/SetupStack.h b/Setup/SetupStack.h
index fdfde3d8bbc572b05703a10b1e983873bc30fd04..e3929d1db27127ebea8d24852b208d66ef5be54f 100644
--- a/Setup/SetupStack.h
+++ b/Setup/SetupStack.h
@@ -12,9 +12,17 @@
 #ifndef _corsika_setup_setupstack_h_
 #define _corsika_setup_setupstack_h_
 
-#include <corsika/stack/nuclear_extension/NuclearStackExtension.h>
+// the basic particle data stack:
 #include <corsika/stack/super_stupid/SuperStupidStack.h>
 
+// extension with nuclear data for Code::Nucleus
+#include <corsika/stack/nuclear_extension/NuclearStackExtension.h>
+
+// extension with geometry information for tracking
+#include <corsika/stack/CombinedStack.h>
+#include <corsika/stack/CombinedStack.h>
+
+
 // this is an auxiliary help typedef, which I don't know how to put
 // into NuclearStackExtension.h where it belongs...
 template <typename StackIter>
diff --git a/do-copyright.py b/do-copyright.py
index 24c5beb6af4f277c016c2d8a0870ff303e734d61..b88829bcf154e6fcbb0932cc02edfdd2b489cd5a 100755
--- a/do-copyright.py
+++ b/do-copyright.py
@@ -14,6 +14,8 @@ text = """
  */\n
 """
 
+Debug = 0 # 0: nothing, 1: checking, 2: filesystem
+
 excludeDirs = ["ThirdParty", "git"]
 excludeFiles = ['PhysicalConstants.h','CorsikaFenvOSX.cc']
 
@@ -21,6 +23,10 @@ extensions = [".cc", ".h", ".test"]
 
 def checkNote(filename):
 
+    if Debug>0:
+        print ("***********************************************")
+        print ("file: " + filename )
+    
     startNote = []
     endNote = []
 
@@ -46,7 +52,13 @@ def checkNote(filename):
                 endNote.append(iLine)
             searchStatus = 0
         iLine += 1
-        
+
+    if Debug>0:
+        txt = "states: n=" + str(len(startNote))
+        for i in xrange(len(startNote)):
+            txt += ",  [" + str(startNote[i]) + "-" + str(endNote[i]) + "]"         
+        print ("stats: ") + txt
+
     # now check if first copyright notices is already identical...
     isSame = False
     if len(startNote)>0: 
@@ -58,8 +70,10 @@ def checkNote(filename):
                 break
             if noteLines[iLine+1].strip(" \n") != lines[startNote[0]+iLine].strip(" \n"):
                 isSame = False
-                print "need update: " + filename + " new=\'" + noteLines[iLine+1] + "\' vs old=\'" + lines[startNote+iLine].rstrip('\n') + "\'"
+                print "need update: " + filename + " new=\'" + noteLines[iLine+1] + "\' vs old=\'" + lines[startNote[0]+iLine].rstrip('\n') + "\'"
                 break
+    if Debug>0:
+        print ("isSame=" + str(isSame))
     
     # check if notice is the same, or we need to remove multiple notices...
     if isSame and len(startNote)<=1:
@@ -98,16 +112,25 @@ def checkNote(filename):
 def next_file(x, dir_name, files):
     for check in excludeDirs :
         if check in dir_name:
-            return
+            if Debug>1:
+                print ("exclude-dir: " + check)
+            return True
     for check in files :
+        if (os.path.isdir(check)):
+            continue
         filename, file_extension = os.path.splitext(check)
         if '#' in check or '~' in check:
-            return
+            continue
         for check2 in excludeFiles :
             if check2 in check:
-                return
+                if Debug>1:
+                    print ("exclude: " + check2)
+                continue
         if file_extension in extensions:
             checkNote(dir_name + "/" + check)
+        else:
+            if Debug>1:
+                print ("exclude-extension: " + dir_name + "/" + check)
 
 
 os.path.walk("./", next_file, 0)