diff --git a/CommandDistributor.cpp b/CommandDistributor.cpp
index d9aca29..4e5ecb9 100644
--- a/CommandDistributor.cpp
+++ b/CommandDistributor.cpp
@@ -1,5 +1,8 @@
 /*
- *  © 2020,Gregor Baues,  Chris Harlow. All rights reserved.
+ *  © 2022 Harald Barth
+ *  © 2020-2021 Chris Harlow
+ *  © 2020 Gregor Baues
+ *  All rights reserved.
  *
  *  This file is part of CommandStation-EX
  *
diff --git a/CommandDistributor.h b/CommandDistributor.h
index 22a5acf..51458fa 100644
--- a/CommandDistributor.h
+++ b/CommandDistributor.h
@@ -1,5 +1,8 @@
 /*
- *  © 2020,Gregor Baues,  Chris Harlow. All rights reserved.
+ *  © 2022 Harald Barth
+ *  © 2020-2021 Chris Harlow
+ *  © 2020 Gregor Baues
+ *  All rights reserved.
  *
  *  This file is part of CommandStation-EX
  *
diff --git a/CommandStation-EX.ino b/CommandStation-EX.ino
index d51108f..9e38ccc 100644
--- a/CommandStation-EX.ino
+++ b/CommandStation-EX.ino
@@ -25,8 +25,10 @@
 
 
 /*
- *  © 2020,2021 Chris Harlow, Harald Barth, David Cutting,
- *  Fred Decker, Gregor Baues, Anthony W - Dayton  All rights reserved.
+ *  © 2021 Neil McKechnie
+ *  © 2020-2021 Chris Harlow, Harald Barth, David Cutting,
+ *  Fred Decker, Gregor Baues, Anthony W - Dayton
+ *  All rights reserved.
  *
  *  This file is part of CommandStation-EX
  *
diff --git a/DCC.cpp b/DCC.cpp
index 59999c1..6a05f69 100644
--- a/DCC.cpp
+++ b/DCC.cpp
@@ -1,6 +1,12 @@
 /*
- *  © 2020, Chris Harlow. All rights reserved.
- *  © 2020, Harald Barth
+ *  © 2021 Neil McKechnie
+ *  © 2021 Mike S
+ *  © 2021 Fred Decker
+ *  © 2021 Herb Morton
+ *  © 2020-2022 Harald Barth
+ *  © 2020-2021 M Steve Todd
+ *  © 2020-2021 Chris Harlow
+ *  All rights reserved.
  *
  *  This file is part of Asbelos DCC API
  *
diff --git a/DCC.h b/DCC.h
index c45a658..fbeb603 100644
--- a/DCC.h
+++ b/DCC.h
@@ -1,5 +1,10 @@
 /*
- *  © 2020, Chris Harlow. All rights reserved.
+ *  © 2021 Mike S
+ *  © 2021 Fred Decker
+ *  © 2021 Herb Morton
+ *  © 2020-2021 Harald Barth
+ *  © 2020-2021 Chris Harlow
+ *  All rights reserved.
  *  
  *  This file is part of Asbelos DCC API
  *
diff --git a/DCCEX.h b/DCCEX.h
index 568f2d3..ebae436 100644
--- a/DCCEX.h
+++ b/DCCEX.h
@@ -1,7 +1,8 @@
 /*
- *  (c) 2020 Chris Harlow. All rights reserved.
- *  (c) 2021 Fred Decker.  All rights reserved.
- *  (c) 2020 Harald Barth. All rights reserved.
+ *  © 2021 Fred Decker
+ *  © 2020-2021 Harald Barth
+ *  © 2020-2021 Chris Harlow
+ *  All rights reserved.
  *  
  *  This file is part of CommandStation-EX
  *
diff --git a/DCCEXParser.cpp b/DCCEXParser.cpp
index 8d20ab2..2e1856f 100644
--- a/DCCEXParser.cpp
+++ b/DCCEXParser.cpp
@@ -1,6 +1,12 @@
 /*
- *  © 2020, Chris Harlow. All rights reserved.
- *  © 2020, Harald Barth.
+ *  © 2021 Neil McKechnie
+ *  © 2021 Mike S
+ *  © 2021 Herb Morton
+ *  © 2020-2022 Harald Barth
+ *  © 2020-2021 M Steve Todd
+ *  © 2020-2021 Fred Decker
+ *  © 2020-2021 Chris Harlow
+ *  All rights reserved.
  *  
  *  This file is part of CommandStation-EX
  *
diff --git a/DCCEXParser.h b/DCCEXParser.h
index 8f577a4..5761eb0 100644
--- a/DCCEXParser.h
+++ b/DCCEXParser.h
@@ -1,5 +1,8 @@
 /*
- *  © 2020, Chris Harlow. All rights reserved.
+ *  © 2021 Mike S
+ *  © 2021 Fred Decker
+ *  © 2020-2021 Chris Harlow
+ *  All rights reserved.
  *  
  *  This file is part of Asbelos DCC API
  *
diff --git a/DCCTimer.cpp b/DCCTimer.cpp
index 727caa1..cd35293 100644
--- a/DCCTimer.cpp
+++ b/DCCTimer.cpp
@@ -1,5 +1,10 @@
 /*
- *  © 2021, Chris Harlow & David Cutting. All rights reserved.
+ *  © 2021 Mike S
+ *  © 2021 Harald Barth
+ *  © 2021 Fred Decker
+ *  © 2021 Chris Harlow
+ *  © 2021 David Cutting
+ *  All rights reserved.
  *  
  *  This file is part of Asbelos DCC API
  *
diff --git a/DCCTimer.h b/DCCTimer.h
index b518701..8f8f5bc 100644
--- a/DCCTimer.h
+++ b/DCCTimer.h
@@ -1,6 +1,8 @@
 /*
- *  (c) 2021 Mike S. All rights reserved.
- *  (c) 2021 Fred Decker.  All rights reserved.
+ *  © 2021 Mike S
+ *  © 2021 Harald Barth
+ *  © 2021 Fred Decker
+ *  All rights reserved.
  *  
  *  This file is part of CommandStation-EX
  *
diff --git a/DCCWaveform.cpp b/DCCWaveform.cpp
index dd447ca..511e7db 100644
--- a/DCCWaveform.cpp
+++ b/DCCWaveform.cpp
@@ -1,8 +1,12 @@
 /*
- *  © 2020, Chris Harlow. All rights reserved.
- *  © 2020, Harald Barth.
+ *  © 2021 Neil McKechnie
+ *  © 2021 Mike S
+ *  © 2021 Fred Decker
+ *  © 2020-2021 Harald Barth
+ *  © 2020-2021 Chris Harlow
+ *  All rights reserved.
  *  
- *  This file is part of Asbelos DCC API
+ *  This file is part of CommandStation-EX
  *
  *  This is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
diff --git a/DCCWaveform.h b/DCCWaveform.h
index 29d6a29..14f2f11 100644
--- a/DCCWaveform.h
+++ b/DCCWaveform.h
@@ -1,8 +1,12 @@
 /*
- *  © 2020, Chris Harlow. All rights reserved.
- *  © 2020, Harald Barth.
+ *  © 2021 M Steve Todd
+ *  © 2021 Mike S
+ *  © 2021 Fred Decker
+ *  © 2020-2021 Harald Barth
+ *  © 2020-2021 Chris Harlow
+ *  All rights reserved.
  *  
- *  This file is part of Asbelos DCC API
+ *  This file is part of CommandStation-EX
  *
  *  This is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
diff --git a/DIAG.h b/DIAG.h
index 1457796..c942e59 100644
--- a/DIAG.h
+++ b/DIAG.h
@@ -1,7 +1,9 @@
 /*
- *  © 2020, Chris Harlow. All rights reserved.
+ *  © 2021 Fred Decker
+ *  © 2020 Chris Harlow
+ *  All rights reserved.
  *  
- *  This file is part of Asbelos DCC API
+ *  This file is part of CommandStation-EX
  *
  *  This is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
diff --git a/DisplayInterface.cpp b/DisplayInterface.cpp
index 37e66f2..8fe45d3 100644
--- a/DisplayInterface.cpp
+++ b/DisplayInterface.cpp
@@ -1,5 +1,7 @@
 /*
- *  © 2021, Chris Harlow, Neil McKechnie. All rights reserved.
+ *  © 2021 Neil McKechnie
+ *  © 2021 Chris Harlow
+ *  All rights reserved.
  *
  *  This file is part of CommandStation-EX
  *
@@ -19,4 +21,4 @@
 
 #include "DisplayInterface.h"
 
-DisplayInterface *DisplayInterface::lcdDisplay = 0;
\ No newline at end of file
+DisplayInterface *DisplayInterface::lcdDisplay = 0;
diff --git a/DisplayInterface.h b/DisplayInterface.h
index 9e7c4d6..64fc1de 100644
--- a/DisplayInterface.h
+++ b/DisplayInterface.h
@@ -1,5 +1,7 @@
 /*
- *  © 2021, Chris Harlow, Neil McKechnie. All rights reserved.
+ *  © 2021 Neil McKechnie
+ *  © 2021 Chris Harlow
+ *  All rights reserved.
  *
  *  This file is part of CommandStation-EX
  *
@@ -32,4 +34,4 @@ public:
   static DisplayInterface *lcdDisplay;
 };
 
-#endif
\ No newline at end of file
+#endif
diff --git a/EEStore.cpp b/EEStore.cpp
index 1a4cd2c..a441f00 100644
--- a/EEStore.cpp
+++ b/EEStore.cpp
@@ -1,9 +1,12 @@
 /*
+ *  © 2021 Neil McKechnie
+ *  © 2021 Fred Decker
+ *  © 2020-2021 Harald Barth
+ *  © 2020-2021 Chris Harlow
  *  © 2013-2016 Gregg E. Berman
- *  © 2020, Chris Harlow. All rights reserved.
- *  © 2020, Harald Barth.
+ *  All rights reserved.
  *
- *  This file is part of Asbelos DCC API
+ *  This file is part of CommandStation-EX
  *
  *  This is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
diff --git a/EEStore.h b/EEStore.h
index 22e12dd..f0d9022 100644
--- a/EEStore.h
+++ b/EEStore.h
@@ -1,6 +1,9 @@
 /*
- *  (c) 2020 Chris Harlow. All rights reserved.
- *  (c) 2020 Harald Barth. All rights reserved.
+ *  © 2021 Neil McKechnie
+ *  © 2021 Fred Decker
+ *  © 2020-2021 Harald Barth
+ *  © 2020 Chris Harlow
+ *  All rights reserved.
  *  
  *  This file is part of CommandStation-EX
  *
diff --git a/EthernetInterface.cpp b/EthernetInterface.cpp
index 161e114..f691f45 100644
--- a/EthernetInterface.cpp
+++ b/EthernetInterface.cpp
@@ -1,5 +1,9 @@
 /*
- *  © 2020,Gregor Baues,  Chris Harlow. All rights reserved.
+ *  © 2021 Fred Decker
+ *  © 2020-2021 Harald Barth
+ *  © 2020-2021 Chris Harlow
+ *  © 2020 Gregor Baues
+ *  All rights reserved.
  *  
  *  This file is part of DCC-EX/CommandStation-EX
  *
diff --git a/EthernetInterface.h b/EthernetInterface.h
index 0ea641c..2a94ac6 100644
--- a/EthernetInterface.h
+++ b/EthernetInterface.h
@@ -1,5 +1,10 @@
 /*
- *  © 2020,Gregor Baues,  Chris Harlow. All rights reserved.
+ *  © 2021 Neil McKechnie
+ *  © 2021 Mike S
+ *  © 2021 Fred Decker
+ *  © 2020-2021 Chris Harlow
+ *  © 2020 Gregor Baues
+ *  All rights reserved.
  *  
  *  This file is part of DCC-EX/CommandStation-EX
  *
diff --git a/FSH.h b/FSH.h
index 7961b7c..c901fb9 100644
--- a/FSH.h
+++ b/FSH.h
@@ -1,5 +1,8 @@
 /*
- *  (c) 2021 Fred Decker.  All rights reserved.
+ *  © 2021 Neil McKechnie
+ *  © 2021 Harald Barth
+ *  © 2021 Fred Decker
+ *  All rights reserved.
  *  
  *  This file is part of CommandStation-EX
  *
diff --git a/IODevice.cpp b/IODevice.cpp
index b61ecf8..f13404c 100644
--- a/IODevice.cpp
+++ b/IODevice.cpp
@@ -1,5 +1,7 @@
 /*
- *  © 2021, Neil McKechnie. All rights reserved.
+ *  © 2021 Neil McKechnie
+ *  © 2021 Harald Barth
+ *  All rights reserved.
  *  
  *  This file is part of DCC++EX API
  *
diff --git a/LCN.h b/LCN.h
index 9fbcadf..176d9a2 100644
--- a/LCN.h
+++ b/LCN.h
@@ -1,5 +1,7 @@
 /*
- *  (c) 2021 Fred Decker.  All rights reserved.
+ *  © 2021 Harald Barth
+ *  © 2021 Fred Decker
+ *  All rights reserved.
  *  
  *  This file is part of CommandStation-EX
  *
diff --git a/MotorDriver.cpp b/MotorDriver.cpp
index e1b337f..35c4388 100644
--- a/MotorDriver.cpp
+++ b/MotorDriver.cpp
@@ -1,7 +1,11 @@
 /*
- *  © 2020, Chris Harlow. All rights reserved.
+ *  © 2021 Mike S
+ *  © 2021 Fred Decker
+ *  © 2020-2022 Harald Barth
+ *  © 2020-2021 Chris Harlow
+ *  All rights reserved.
  *  
- *  This file is part of Asbelos DCC API
+ *  This file is part of CommandStation-EX
  *
  *  This is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
diff --git a/MotorDriver.h b/MotorDriver.h
index 08db049..62d9cb5 100644
--- a/MotorDriver.h
+++ b/MotorDriver.h
@@ -1,5 +1,8 @@
 /*
- *  © 2020, Chris Harlow. All rights reserved.
+ *  © 2021 Mike S
+ *  © 2021 Fred Decker
+ *  © 2020 Chris Harlow
+ *  All rights reserved.
  *  
  *  This file is part of Asbelos DCC API
  *
diff --git a/MotorDrivers.h b/MotorDrivers.h
index 8ffc907..feea27e 100644
--- a/MotorDrivers.h
+++ b/MotorDrivers.h
@@ -1,4 +1,6 @@
 /*
+ *  © 2021 Fred Decker
+ *  © 2020-2022 Harald Barth
  *  (c) 2020 Chris Harlow. All rights reserved.
  *  (c) 2021 Fred Decker.  All rights reserved.
  *  (c) 2020 Harald Barth. All rights reserved.
diff --git a/Outputs.cpp b/Outputs.cpp
index 3cc7a43..fd459b6 100644
--- a/Outputs.cpp
+++ b/Outputs.cpp
@@ -1,5 +1,9 @@
 /*
- *  © 2020, Chris Harlow. All rights reserved.
+ *  © 2021 Neil McKechnie
+ *  © 2021 Harald Barth
+ *  © 2020-2021 Fred Decker
+ *  © 2020-2021 Chris Harlow
+ *  All rights reserved.
  *  
  *  This file is part of Asbelos DCC API
  *
diff --git a/Outputs.h b/Outputs.h
index 017bf7e..556f526 100644
--- a/Outputs.h
+++ b/Outputs.h
@@ -1,5 +1,8 @@
 /*
- *  © 2020, Chris Harlow. All rights reserved.
+ *  © 2021 Harald Barth
+ *  © 2021 Fred Decker
+ *  © 2020 Chris Harlow
+ *  All rights reserved.
  *  
  *  This file is part of Asbelos DCC API
  *
diff --git a/RMFT2.cpp b/RMFT2.cpp
index 1ba3867..8fedce4 100644
--- a/RMFT2.cpp
+++ b/RMFT2.cpp
@@ -1,5 +1,8 @@
 /*
- *  © 2020,2021 Chris Harlow. All rights reserved.
+ *  © 2021 Neil McKechnie
+ *  © 2021-2022 Harald Barth
+ *  © 2020-2022 Chris Harlow
+ *  All rights reserved.
  *  
  *  This file is part of CommandStation-EX
  *
diff --git a/RMFT2.h b/RMFT2.h
index e24e845..97f9fdd 100644
--- a/RMFT2.h
+++ b/RMFT2.h
@@ -1,5 +1,7 @@
 /*
- *  © 2020, Chris Harlow. All rights reserved.
+ *  © 2021 Neil McKechnie
+ *  © 2020-2022 Chris Harlow
+ *  All rights reserved.
  *  
  *  This file is part of CommandStation-EX
  *
diff --git a/RMFT2MacroReset.h b/RMFT2MacroReset.h
index 4cf2136..852eb70 100644
--- a/RMFT2MacroReset.h
+++ b/RMFT2MacroReset.h
@@ -1,4 +1,5 @@
 /*
+ *  © 2021-2022 Chris Harlow
  *  © 2020,2021 Chris Harlow. All rights reserved.
  *  
  *  This file is part of CommandStation-EX
diff --git a/RMFTMacros.h b/RMFTMacros.h
index 85da8e1..3e274f4 100644
--- a/RMFTMacros.h
+++ b/RMFTMacros.h
@@ -1,5 +1,7 @@
 /*
- *  © 2020,2021 Chris Harlow. All rights reserved.
+ *  © 2021 Neil McKechnie
+ *  © 2020-2022 Chris Harlow
+ *  All rights reserved.
  *  
  *  This file is part of CommandStation-EX
  *
diff --git a/RingStream.cpp b/RingStream.cpp
index 6e3abb7..bf89e33 100644
--- a/RingStream.cpp
+++ b/RingStream.cpp
@@ -1,5 +1,6 @@
 /*
- *  © 2020, Chris Harlow. All rights reserved.
+ *  © 2020-2021 Chris Harlow
+ *  All rights reserved.
  *  
  *  This file is part of DCC-EX CommandStation-EX
  *
diff --git a/RingStream.h b/RingStream.h
index 8ba1c28..5821bc4 100644
--- a/RingStream.h
+++ b/RingStream.h
@@ -1,7 +1,8 @@
 #ifndef RingStream_h
 #define RingStream_h
 /*
- *  © 2020, Chris Harlow. All rights reserved.
+ *  © 2020-2021 Chris Harlow
+ *  All rights reserved.
  *  
  *  This file is part of DCC-EX CommandStation-EX
  *
diff --git a/Sensors.cpp b/Sensors.cpp
index cde3fbe..d1c0fe5 100644
--- a/Sensors.cpp
+++ b/Sensors.cpp
@@ -1,8 +1,10 @@
 /*
- *  © 2020, Chris Harlow. All rights reserved.
- *  © 2021, modified by Neil McKechnie. All rights reserved.
+ *  © 2021 Neil McKechnie
+ *  © 2020-2021 Harald Barth
+ *  © 2020-2021 Chris Harlow
+ *  All rights reserved.
  *  
- *  This file is part of Asbelos DCC API
+ *  This file is part of CommandStation-EX
  *
  *  This is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
diff --git a/Sensors.h b/Sensors.h
index f63a668..4b12a03 100644
--- a/Sensors.h
+++ b/Sensors.h
@@ -1,5 +1,8 @@
 /*
- *  © 2020, Chris Harlow. All rights reserved.
+ *  © 2021 Neil McKechnie
+ *  © 2020-2021 Harald Barth
+ *  © 2020-2021 Chris Harlow
+ *  All rights reserved.
  *  
  *  This file is part of Asbelos DCC API
  *
diff --git a/SerialManager.cpp b/SerialManager.cpp
index 1957dcc..53c04c7 100644
--- a/SerialManager.cpp
+++ b/SerialManager.cpp
@@ -1,5 +1,6 @@
  /*
- *  © 2021, Chris Harlow. All rights reserved.
+ *  © 2021 Chris Harlow
+ *  All rights reserved.
  *  
  *  This file is part of DCC++EX
  *
@@ -73,4 +74,4 @@ void SerialManager::loop2() {
         }
     }
     
-}
\ No newline at end of file
+}
diff --git a/SerialManager.h b/SerialManager.h
index 0b017f0..32960d5 100644
--- a/SerialManager.h
+++ b/SerialManager.h
@@ -1,5 +1,6 @@
  /*
- *  © 2021, Chris Harlow. All rights reserved.
+ *  © 2021 Chris Harlow
+ *  All rights reserved.
  *  
  *  This file is part of DCC++EX
  *
@@ -45,4 +46,4 @@ private:
   byte buffer[COMMAND_BUFFER_SIZE]; 
   bool inCommandPayload;
 };
-#endif
\ No newline at end of file
+#endif
diff --git a/Turnouts.cpp b/Turnouts.cpp
index 3b03b8d..e4aec20 100644
--- a/Turnouts.cpp
+++ b/Turnouts.cpp
@@ -1,10 +1,13 @@
 /*
- *  © 2021 Restructured Neil McKechnie
+ *  © 2021 Neil McKechnie
+ *  © 2021 M Steve Todd
+ *  © 2021 Fred Decker
+ *  © 2020-2021 Harald Barth
+ *  © 2020-2021 Chris Harlow
  *  © 2013-2016 Gregg E. Berman
- *  © 2020, Chris Harlow. All rights reserved.
- *  © 2020, Harald Barth.
+ *  All rights reserved.
  *  
- *  This file is part of Asbelos DCC API
+ *  This file is part of CommandStation-EX
  *
  *  This is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
diff --git a/Turnouts.h b/Turnouts.h
index 8666250..e394c85 100644
--- a/Turnouts.h
+++ b/Turnouts.h
@@ -1,9 +1,13 @@
 /*
- *  © 2021 Restructured Neil McKechnie
+ *  © 2021 Neil McKechnie
+ *  © 2021 M Steve Todd
+ *  © 2021 Fred Decker
+ *  © 2020-2021 Harald Barth
+ *  © 2020-2021 Chris Harlow
  *  © 2013-2016 Gregg E. Berman
- *  © 2020, Chris Harlow. All rights reserved.
+ *  All rights reserved.
  *  
- *  This file is part of Asbelos DCC API
+ *  This file is part of CommandStation-EX
  *
  *  This is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
diff --git a/WiThrottle.cpp b/WiThrottle.cpp
index 9c2f763..af6dbff 100644
--- a/WiThrottle.cpp
+++ b/WiThrottle.cpp
@@ -1,8 +1,12 @@
 /*
- *  © 2020, Chris Harlow. All rights reserved.
- *  © 2020, Harald Barth
+ *  © 2021 Neil McKechnie
+ *  © 2021 Mike S
+ *  © 2020-2022 Harald Barth
+ *  © 2020-2021 M Steve Todd
+ *  © 2020-2021 Chris Harlow
+ *  All rights reserved.
  *  
- *  This file is part of Asbelos DCC API
+ *  This file is part of CommandStation-EX
  *
  *  This is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
diff --git a/WiThrottle.h b/WiThrottle.h
index 43383c0..54ca703 100644
--- a/WiThrottle.h
+++ b/WiThrottle.h
@@ -1,5 +1,7 @@
 /*
- *  © 2020, Chris Harlow. All rights reserved.
+ *  © 2021 Mike S
+ *  © 2020-2021 Chris Harlow
+ *  All rights reserved.
  *  
  *  This file is part of Asbelos DCC API
  *
diff --git a/WifiInboundHandler.cpp b/WifiInboundHandler.cpp
index 118b231..a509409 100644
--- a/WifiInboundHandler.cpp
+++ b/WifiInboundHandler.cpp
@@ -1,4 +1,7 @@
 /*
+ *  © 2021 Fred Decker
+ *  © 2021 Fred Decker
+ *  © 2020-2021 Chris Harlow
  *  © 2020, Chris Harlow. All rights reserved.
  *  © 2020, Harald Barth.
  *  
diff --git a/WifiInboundHandler.h b/WifiInboundHandler.h
index 012c104..d3410cd 100644
--- a/WifiInboundHandler.h
+++ b/WifiInboundHandler.h
@@ -1,4 +1,6 @@
 /*
+ *  © 2021 Harald Barth
+ *  © 2021 Fred Decker
  *  (c) 2021 Fred Decker.  All rights reserved.
  *  (c) 2020 Chris Harlow. All rights reserved.
  *
diff --git a/WifiInterface.cpp b/WifiInterface.cpp
index 6d6f397..ef951d8 100644
--- a/WifiInterface.cpp
+++ b/WifiInterface.cpp
@@ -1,22 +1,24 @@
 /*
-    © 2020, Chris Harlow. All rights reserved.
-    © 2020, Harald Barth.
-
-    This file is part of CommandStation-EX
-
-    This is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    It is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with CommandStation.  If not, see <https://www.gnu.org/licenses/>.
-*/
+ *  © 2021 Fred Decker
+ *  © 2020-2022 Harald Barth
+ *  © 2020-2022 Chris Harlow
+ *  All rights reserved.
+ *
+ *  This file is part of CommandStation-EX
+ *
+ *  This is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  It is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with CommandStation.  If not, see <https://www.gnu.org/licenses/>.
+ /
 #ifndef ARDUINO_AVR_UNO_WIFI_REV2
 // This code is NOT compiled on a unoWifiRev2 processor which uses a different architecture 
 #include "WifiInterface.h"        /* config.h included there */
diff --git a/WifiInterface.h b/WifiInterface.h
index 8d77ab8..0a4e477 100644
--- a/WifiInterface.h
+++ b/WifiInterface.h
@@ -1,7 +1,8 @@
 /*
- *  © 2020, Chris Harlow. All rights reserved.
+ *  © 2020-2021 Chris Harlow
  *  © 2020, Harald Barth.
- *  
+ *  All rights reserved.
+ *
  *  This file is part of CommandStation-EX
  *
  *  This is free software: you can redistribute it and/or modify
diff --git a/config.example.h b/config.example.h
index c0b2b58..55aa184 100644
--- a/config.example.h
+++ b/config.example.h
@@ -1,5 +1,8 @@
 /*
- *  COPYRIGHT (c) 2020 Fred Decker
+ *  © 2021 Neil McKechnie
+ *  © 2020-2021 Harald Barth
+ *  © 2020-2021 Fred Decker
+ *  © 2020-2021 Chris Harlow
  *  
  *  This file is part of CommandStation-EX
  *
diff --git a/defines.h b/defines.h
index 038b9de..01b270e 100644
--- a/defines.h
+++ b/defines.h
@@ -1,22 +1,26 @@
 /*
-    © 2020, Harald Barth.
-
-    This file is part of CommandStation-EX
-
-    This is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    It is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with CommandStation.  If not, see <https://www.gnu.org/licenses/>.
-
-*/
+ *  © 2021 Neil McKechnie
+ *  © 2021 Mike S
+ *  © 2021 Fred Decker
+ *  © 2020-2021 Harald Barth
+ *  © 2020-2021 Chris Harlow
+ *
+ *  This file is part of CommandStation-EX
+ *
+ *  This is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  It is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with CommandStation.  If not, see <https://www.gnu.org/licenses/>.
+ *
+ */
 
 #ifndef DEFINES_H
 #define DEFINES_H
diff --git a/freeMemory.cpp b/freeMemory.cpp
index 5514e8d..df5ab8a 100644
--- a/freeMemory.cpp
+++ b/freeMemory.cpp
@@ -1,6 +1,7 @@
 /*
- *  © 2020, Harald Barth
- *  © 2021, Neil McKechnie
+ *  © 2021 Neil McKechnie
+ *  © 2021 Mike S
+ *  © 2020 Harald Barth
  *  
  *  This file is part of Asbelos DCC-EX
  *
diff --git a/freeMemory.h b/freeMemory.h
index 3d1fe40..af93566 100644
--- a/freeMemory.h
+++ b/freeMemory.h
@@ -1,6 +1,6 @@
 /*
- *  © 2020, Harald Barth
- *  © 2021, Neil McKechnie
+ *  © 2021 Neil McKechnie
+ *  © 2020 Harald Barth
  *  
  *  This file is part of DCC-EX
  *