diff --git a/MK/module/HAL/HAL.cpp b/MK/module/HAL/HAL.cpp
index 78a8c710dc3daa5657fc48e9a16e3c53b22e2622..eb2efebea230e520a51818d5bbbf4b0b352a5294 100644
--- a/MK/module/HAL/HAL.cpp
+++ b/MK/module/HAL/HAL.cpp
@@ -1,23 +1,54 @@
-/*
- This program 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.
-
- This program 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 this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-// **************************************************************************
-//
-// Description:          *** HAL for Arduino ***
-//
-// **************************************************************************
+/**
+ * MK & MK4due 3D Printer Firmware
+ *
+ * Based on Marlin, Sprinter and grbl
+ * Copyright (C) 2011 Camiel Gubbels / Erik van der Zalm
+ * Copyright (C) 2013 - 2016 Alberto Cotronei @MagoKimbra
+ *
+ * This program 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.
+ *
+ * This program 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 this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+/**
+ * This is the main Hardware Abstraction Layer (HAL).
+ * To make the firmware work with different processors and toolchains,
+ * all hardware related code should be packed into the hal files.
+ *
+ * This program 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.
+ *
+ * This program 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 this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ *
+ * Description:          *** HAL for Arduino ***
+ *
+ * Contributors:
+ * Copyright (c) 2014 Bob Cousins bobcousins42@googlemail.com
+ *                    Nico Tonnhofer wurstnase.reprap@gmail.com
+ *
+ * Copyright (c) 2015 - 2016 Alberto Cotronei @MagoKimbra
+ *
+ * ARDUINO_ARCH_ARM
+ */
 
 // --------------------------------------------------------------------------
 // Includes
diff --git a/MK/module/HAL/HAL.h b/MK/module/HAL/HAL.h
index 3f870a7cdea461753949d8478537788cf423b24b..c555ea2479cf6dc1ed2e76d0204666355ff45494 100644
--- a/MK/module/HAL/HAL.h
+++ b/MK/module/HAL/HAL.h
@@ -1,3 +1,25 @@
+/**
+ * MK & MK4due 3D Printer Firmware
+ *
+ * Based on Marlin, Sprinter and grbl
+ * Copyright (C) 2011 Camiel Gubbels / Erik van der Zalm
+ * Copyright (C) 2013 - 2016 Alberto Cotronei @MagoKimbra
+ *
+ * This program 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.
+ *
+ * This program 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 this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
 /**
  * This is the main Hardware Abstraction Layer (HAL).
  * To make the firmware work with different processors and toolchains,
@@ -19,6 +41,12 @@
  *
  * Description:          *** HAL for Arduino ***
  *
+ * Contributors:
+ * Copyright (c) 2014 Bob Cousins bobcousins42@googlemail.com
+ *                    Nico Tonnhofer wurstnase.reprap@gmail.com
+ *
+ * Copyright (c) 2015 - 2016 Alberto Cotronei @MagoKimbra
+ *
  * ARDUINO_ARCH_ARM
  */
 
diff --git a/MK/module/HAL/fastio.h b/MK/module/HAL/fastio.h
index 6251559cccdb3fe91a49c51a9aa495f0b96d743f..9d11898917dad8a1ccbe66a746e5b463005a6abd 100644
--- a/MK/module/HAL/fastio.h
+++ b/MK/module/HAL/fastio.h
@@ -1,3 +1,25 @@
+/**
+ * MK & MK4due 3D Printer Firmware
+ *
+ * Based on Marlin, Sprinter and grbl
+ * Copyright (C) 2011 Camiel Gubbels / Erik van der Zalm
+ * Copyright (C) 2013 - 2016 Alberto Cotronei @MagoKimbra
+ *
+ * This program 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.
+ *
+ * This program 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 this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
 /*
   This code contributed by Triffid_Hunter and modified by Kliment
   why double up on these macros? see http://gcc.gnu.org/onlinedocs/cpp/Stringification.html
diff --git a/MK/module/MK_Main.cpp b/MK/module/MK_Main.cpp
index 51b66867f551fb93088c1eb05d26f5815433ad11..6b4f3f14abdef56a89eeeaf14978b507d505b5f3 100644
--- a/MK/module/MK_Main.cpp
+++ b/MK/module/MK_Main.cpp
@@ -1,5 +1,5 @@
 /**
- * MK 3D Printer Firmware
+ * MK & MK4due 3D Printer Firmware
  *
  * Based on Marlin, Sprinter and grbl
  * Copyright (C) 2011 Camiel Gubbels / Erik van der Zalm
@@ -2810,7 +2810,7 @@ static void clean_up_after_endstop_move() {
       ECHO_MV(" /", degTargetHotend(target_extruder), 1);
     #endif
     #if HAS(TEMP_BED)
-      ECHO_MV(" " SERIAL_B, degBed(), 1);
+      ECHO_MV(SERIAL_B, degBed(), 1);
       ECHO_MV(" /", degTargetBed(), 1);
     #endif
     #if HOTENDS > 1
@@ -2822,14 +2822,14 @@ static void clean_up_after_endstop_move() {
       }
     #endif
     #if HAS(TEMP_BED)
-      ECHO_M(" " SERIAL_BAT);
+      ECHO_M(SERIAL_BAT);
       #if ENABLED(BED_WATTS)
         ECHO_VM(((BED_WATTS) * getHeaterPower(-1)) / 127, "W");
       #else
         ECHO_V(getHeaterPower(-1));
       #endif
     #endif
-    ECHO_M(" " SERIAL_AT ":");
+    ECHO_M(SERIAL_AT ":");
     #if ENABLED(HOTEND_WATTS)
       ECHO_VM(((HOTEND_WATTS) * getHeaterPower(target_extruder)) / 127, "W");
     #else
@@ -2837,7 +2837,7 @@ static void clean_up_after_endstop_move() {
     #endif
     #if HOTENDS > 1
       for (uint8_t h = 0; h < HOTENDS; ++h) {
-        ECHO_MV(" " SERIAL_AT, (int)h);
+        ECHO_MV(SERIAL_AT, (int)h);
         ECHO_C(':');
         #if ENABLED(HOTEND_WATTS)
           ECHO_VM(((HOTEND_WATTS) * getHeaterPower(h)) / 127, "W");
@@ -2890,7 +2890,7 @@ inline void wait_heater() {
         print_heaterstates();
       #endif
       #if TEMP_RESIDENCY_TIME > 0
-        ECHO_M(" " SERIAL_W);
+        ECHO_M(SERIAL_W);
         if (residency_start_ms) {
           long rem = ((TEMP_RESIDENCY_TIME * 1000UL) - (now - residency_start_ms)) / 1000UL;
           ECHO_EV(rem);
@@ -2949,7 +2949,7 @@ inline void wait_bed() {
       next_temp_ms = now + 1000UL;
       print_heaterstates();
       #if TEMP_BED_RESIDENCY_TIME > 0
-        ECHO_M(" " SERIAL_W);
+        ECHO_M(SERIAL_W);
         if (residency_start_ms) {
           long rem = (((TEMP_BED_RESIDENCY_TIME) * 1000UL) - (now - residency_start_ms)) / 1000UL;
           ECHO_EV(rem);
@@ -5316,6 +5316,24 @@ inline void gcode_M104() {
       if (dual_x_carriage_mode == DXC_DUPLICATION_MODE && target_extruder == 0)
         setTargetHotend1(temp == 0.0 ? 0.0 : temp + duplicate_extruder_temp_offset);
     #endif
+
+    /**
+     * We use half EXTRUDE_MINTEMP here to allow nozzles to be put into hot
+     * stand by mode, for instance in a dual extruder setup, without affecting
+     * the running print timer.
+     */
+    if (temp <= (EXTRUDE_MINTEMP)/2) {
+      print_job_timer.stop();
+      LCD_MESSAGEPGM(WELCOME_MSG);
+    }
+    /**
+     * We do not check if the timer is already running because this check will
+     * be done for us inside the Stopwatch::start() method thus a running timer
+     * will not restart.
+     */
+    else print_job_timer.start();
+
+    if (temp > degHotend(target_extruder)) LCD_MESSAGEPGM(MSG_HEATING);
   }
 }
 
@@ -5404,16 +5422,33 @@ inline void gcode_M109() {
  * M111: Debug mode Repetier Host compatibile
  */
 inline void gcode_M111() {
-  mk_debug_flags = code_seen('S') ? code_value_short() : DEBUG_INFO|DEBUG_COMMUNICATION;
+  mk_debug_flags = code_seen('S') ? code_value_short() : DEBUG_NONE;
+
+  const static char str_debug_1[]   PROGMEM = SERIAL_DEBUG_ECHO;
+  const static char str_debug_2[]   PROGMEM = SERIAL_DEBUG_INFO;
+  const static char str_debug_4[]   PROGMEM = SERIAL_DEBUG_ERRORS;
+  const static char str_debug_8[]   PROGMEM = SERIAL_DEBUG_DRYRUN;
+  const static char str_debug_16[]  PROGMEM = SERIAL_DEBUG_COMMUNICATION;
+  const static char str_debug_32[]  PROGMEM = SERIAL_DEBUG_DEBUG;
 
-  if (DEBUGGING(ECHO)) ECHO_LM(DB, SERIAL_DEBUG_ECHO);
-  if (DEBUGGING(INFO)) ECHO_LM(DB, SERIAL_DEBUG_INFO);
-  //if (mk_debug_flags & DEBUG_ERRORS) ECHO_LM(DB, SERIAL_DEBUG_ERRORS);
-  if (DEBUGGING(DRYRUN)) {
-    ECHO_LM(DB, SERIAL_DEBUG_DRYRUN);
-    disable_all_heaters();
+  const static char* const debug_strings[] PROGMEM = {
+    str_debug_1, str_debug_2, str_debug_4, str_debug_8, str_debug_16, str_debug_32
+  };
+
+  ECHO_M(SERIAL_DEBUG_PREFIX);
+  if (mk_debug_flags) {
+    uint8_t comma = 0;
+    for (uint8_t i = 0; i < COUNT(debug_strings); i++) {
+      if (TEST(mk_debug_flags, i)) {
+        if (comma++) ECHO_C(',');
+        ECHO_T(debug_strings[i]);
+      }
+    }
   }
-  if (DEBUGGING(DEBUG)) ECHO_LM(DB, SERIAL_DEBUG);
+  else {
+    ECHO_M(SERIAL_DEBUG_OFF);
+  }
+  ECHO_E;
 }
 
 /**
diff --git a/MK/module/MK_Main.h b/MK/module/MK_Main.h
index de4639bb6a44eab8cb6e2767ecf1f4f950b97090..38c3a27f28beb620d80a9573ed3ada1bb1903255 100644
--- a/MK/module/MK_Main.h
+++ b/MK/module/MK_Main.h
@@ -1,5 +1,24 @@
-// Tonokip RepRap firmware rewrite based off of Hydra-mmm firmware.
-// License: GPL
+/**
+ * MK & MK4due 3D Printer Firmware
+ *
+ * Based on Marlin, Sprinter and grbl
+ * Copyright (C) 2011 Camiel Gubbels / Erik van der Zalm
+ * Copyright (C) 2013 - 2016 Alberto Cotronei @MagoKimbra
+ *
+ * This program 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.
+ *
+ * This program 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 this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
 
 #ifndef MK_H
 #define MK_H
@@ -73,7 +92,6 @@ enum DebugFlags {
   DEBUG_DEBUG         = _BV(5)  ///< Print Debug
 };
 extern uint8_t mk_debug_flags;
-#define DEBUGGING(F) (mk_debug_flags & (DEBUG_## F))
 
 void clamp_to_software_endstops(float target[3]);
 
diff --git a/MK/module/blinkm/blinkm.cpp b/MK/module/blinkm/blinkm.cpp
index c477be301f34087c7931b87cb5af059817fc78da..0a62b073fb95ded675a8a514c98379c749a465df 100644
--- a/MK/module/blinkm/blinkm.cpp
+++ b/MK/module/blinkm/blinkm.cpp
@@ -1,3 +1,25 @@
+/**
+ * MK & MK4due 3D Printer Firmware
+ *
+ * Based on Marlin, Sprinter and grbl
+ * Copyright (C) 2011 Camiel Gubbels / Erik van der Zalm
+ * Copyright (C) 2013 - 2016 Alberto Cotronei @MagoKimbra
+ *
+ * This program 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.
+ *
+ * This program 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 this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
 /**
  * blinkm.cpp - Library for controlling a BlinkM over i2c
  * Created by Tim Koster, August 21 2013.
diff --git a/MK/module/blinkm/blinkm.h b/MK/module/blinkm/blinkm.h
index 83f890d616a8757892cd9eaa316307036b450484..f966145ac5f1f6cfbe1049f0897105eaeb8b820d 100644
--- a/MK/module/blinkm/blinkm.h
+++ b/MK/module/blinkm/blinkm.h
@@ -1,6 +1,28 @@
-/*
-  blinkm.h
-  Library header file for BlinkM library
+/**
+ * MK & MK4due 3D Printer Firmware
+ *
+ * Based on Marlin, Sprinter and grbl
+ * Copyright (C) 2011 Camiel Gubbels / Erik van der Zalm
+ * Copyright (C) 2013 - 2016 Alberto Cotronei @MagoKimbra
+ *
+ * This program 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.
+ *
+ * This program 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 this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+/**
+ * blinkm.h
+ * Library header file for BlinkM library
  */
 
 #ifndef BLINKM_H
diff --git a/MK/module/communication/communication.h b/MK/module/communication/communication.h
index 5e2b8214b59d8caa1f732377f2a54415be5dbb4a..7b990bfc2ef0fce01ea9bcaa3af914dce94f6afc 100644
--- a/MK/module/communication/communication.h
+++ b/MK/module/communication/communication.h
@@ -1,3 +1,25 @@
+/**
+ * MK & MK4due 3D Printer Firmware
+ *
+ * Based on Marlin, Sprinter and grbl
+ * Copyright (C) 2011 Camiel Gubbels / Erik van der Zalm
+ * Copyright (C) 2013 - 2016 Alberto Cotronei @MagoKimbra
+ *
+ * This program 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.
+ *
+ * This program 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 this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
 #ifndef COMMUNICATION_H
   #define COMMUNICATION_H
 
diff --git a/MK/module/conditionals.h b/MK/module/conditionals.h
index 5171752cd8b70a13c3c008650597a404dd244220..7a646763b35a187721c82a83577e7ceaddcdcadf 100644
--- a/MK/module/conditionals.h
+++ b/MK/module/conditionals.h
@@ -1,5 +1,5 @@
 /**
- * MK 3D Printer Firmware
+ * MK & MK4due 3D Printer Firmware
  *
  * Based on Marlin, Sprinter and grbl
  * Copyright (C) 2011 Camiel Gubbels / Erik van der Zalm
@@ -12,11 +12,11 @@
  *
  * This program 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
+ * 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 this program.  If not, see <http://www.gnu.org/licenses/>.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  *
  */
 
diff --git a/MK/module/fwtest/firmware_test.cpp b/MK/module/fwtest/firmware_test.cpp
index e8afc5f1aecbe15a6d0781b8fce53bbf407cca5f..be5c6ff7a7060dd85c5726366d6b54f24f551bb5 100644
--- a/MK/module/fwtest/firmware_test.cpp
+++ b/MK/module/fwtest/firmware_test.cpp
@@ -1,6 +1,23 @@
 /**
- * Tools for firmware test
- * By MagoKimbra
+ * MK & MK4due 3D Printer Firmware
+ *
+ * Based on Marlin, Sprinter and grbl
+ * Copyright (C) 2011 Camiel Gubbels / Erik van der Zalm
+ * Copyright (C) 2013 - 2016 Alberto Cotronei @MagoKimbra
+ *
+ * This program 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.
+ *
+ * This program 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 this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
  */
 
 #include "../../base.h"
diff --git a/MK/module/fwtest/firmware_test.h b/MK/module/fwtest/firmware_test.h
index ee7cd2c5a7ccdcea7b1222d7b7e5a2471f2c0134..dc97b9c5def64d67d54b47998eb425241e4f637f 100644
--- a/MK/module/fwtest/firmware_test.h
+++ b/MK/module/fwtest/firmware_test.h
@@ -1,3 +1,25 @@
+/**
+ * MK & MK4due 3D Printer Firmware
+ *
+ * Based on Marlin, Sprinter and grbl
+ * Copyright (C) 2011 Camiel Gubbels / Erik van der Zalm
+ * Copyright (C) 2013 - 2016 Alberto Cotronei @MagoKimbra
+ *
+ * This program 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.
+ *
+ * This program 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 this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
 #ifndef FIRMWARE_TEST_H
   #define FIRMWARE_TEST_H
   void FirmwareTest();
diff --git a/MK/module/language/language.h b/MK/module/language/language.h
index 1cbd462344da3f6c21698928caf77a0aca440bc8..71df7abe3f5bf035e7146e76a86f26f86d0bc875 100644
--- a/MK/module/language/language.h
+++ b/MK/module/language/language.h
@@ -1,3 +1,25 @@
+/**
+ * MK & MK4due 3D Printer Firmware
+ *
+ * Based on Marlin, Sprinter and grbl
+ * Copyright (C) 2011 Camiel Gubbels / Erik van der Zalm
+ * Copyright (C) 2013 - 2016 Alberto Cotronei @MagoKimbra
+ *
+ * This program 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.
+ *
+ * This program 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 this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
 #ifndef LANGUAGE_H
 #define LANGUAGE_H
 
@@ -181,14 +203,14 @@
 #define SERIAL_KU                               " Ku: "
 #define SERIAL_TU                               " Tu: "
 #define SERIAL_CLASSIC_PID                      " Classic PID "
-#define SERIAL_KP                               "Kp: "
+#define SERIAL_KP                               " Kp: "
 #define SERIAL_KI                               " Ki: "
 #define SERIAL_KD                               " Kd: "
-#define SERIAL_B                                "B:"
-#define SERIAL_T                                "T:"
-#define SERIAL_AT                               "@"
-#define SERIAL_BAT                              "B@:"
-#define SERIAL_W                                "W:"
+#define SERIAL_T                                " T:"
+#define SERIAL_B                                " B:"
+#define SERIAL_AT                               " @"
+#define SERIAL_BAT                              " B@:"
+#define SERIAL_W                                " W:"
 #define SERIAL_PID_AUTOTUNE_FINISHED            SERIAL_PID_AUTOTUNE " finished! Put the last Kp, Ki and Kd constants from above into Configuration.h or send command M500 for save in EEPROM the new value!"
 #define SERIAL_PID_DEBUG                        " PID_DEBUG "
 #define SERIAL_PID_DEBUG_INPUT                  ": Input "
diff --git a/MK/module/lcd/buzzer.cpp b/MK/module/lcd/buzzer.cpp
index c08ed795b9c081459f23edb7dddc7e9a4733a529..89796d2dc0da54beb262ed0bc893a546c1d4e9c8 100644
--- a/MK/module/lcd/buzzer.cpp
+++ b/MK/module/lcd/buzzer.cpp
@@ -1,3 +1,25 @@
+/**
+ * MK & MK4due 3D Printer Firmware
+ *
+ * Based on Marlin, Sprinter and grbl
+ * Copyright (C) 2011 Camiel Gubbels / Erik van der Zalm
+ * Copyright (C) 2013 - 2016 Alberto Cotronei @MagoKimbra
+ *
+ * This program 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.
+ *
+ * This program 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 this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
 #include "../../base.h"
 
 #if HAS(BUZZER)
diff --git a/MK/module/lcd/buzzer.h b/MK/module/lcd/buzzer.h
index 77774aa63a8804ef14bd183bedad65a03014f777..9fd1b845d5980768fbf25e936912af844ca72f4d 100644
--- a/MK/module/lcd/buzzer.h
+++ b/MK/module/lcd/buzzer.h
@@ -1,3 +1,25 @@
+/**
+ * MK & MK4due 3D Printer Firmware
+ *
+ * Based on Marlin, Sprinter and grbl
+ * Copyright (C) 2011 Camiel Gubbels / Erik van der Zalm
+ * Copyright (C) 2013 - 2016 Alberto Cotronei @MagoKimbra
+ *
+ * This program 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.
+ *
+ * This program 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 this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
 #ifndef BUZZER_H
   #define BUZZER_H
 
diff --git a/MK/module/lcd/dogm_bitmaps.h b/MK/module/lcd/dogm_bitmaps.h
index 8cc9729c03689738c741a9bece36e2da26715ede..4614b7d6bc9d4b3d68d7cefd2d5a8e9cf0a4f467 100644
--- a/MK/module/lcd/dogm_bitmaps.h
+++ b/MK/module/lcd/dogm_bitmaps.h
@@ -1,3 +1,25 @@
+/**
+ * MK & MK4due 3D Printer Firmware
+ *
+ * Based on Marlin, Sprinter and grbl
+ * Copyright (C) 2011 Camiel Gubbels / Erik van der Zalm
+ * Copyright (C) 2013 - 2016 Alberto Cotronei @MagoKimbra
+ *
+ * This program 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.
+ *
+ * This program 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 this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
 // BitMap for splashscreen
 // Generated with: http://www.digole.com/tools/PicturetoC_Hex_converter.php
 // Please note that using the high-res version takes 402Bytes of PROGMEM.
diff --git a/MK/module/lcd/dogm_lcd_implementation.h b/MK/module/lcd/dogm_lcd_implementation.h
index f081f804676092572201a5c72f5a9d6649585d07..2d5c6ef0ae6ca2d0b9aea8778222342d1627e529 100644
--- a/MK/module/lcd/dogm_lcd_implementation.h
+++ b/MK/module/lcd/dogm_lcd_implementation.h
@@ -1,5 +1,5 @@
 /**
- * MK 3D Printer Firmware
+ * MK & MK4due 3D Printer Firmware
  *
  * Based on Marlin, Sprinter and grbl
  * Copyright (C) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/MK/module/lcd/ultralcd.cpp b/MK/module/lcd/ultralcd.cpp
index c26ed57fc0f59596eee9806305f1e4c2a65b05ab..d7d18f21e9c74f519cb3e6744abb606fcca8d462 100644
--- a/MK/module/lcd/ultralcd.cpp
+++ b/MK/module/lcd/ultralcd.cpp
@@ -1,3 +1,25 @@
+/**
+ * MK & MK4due 3D Printer Firmware
+ *
+ * Based on Marlin, Sprinter and grbl
+ * Copyright (C) 2011 Camiel Gubbels / Erik van der Zalm
+ * Copyright (C) 2013 - 2016 Alberto Cotronei @MagoKimbra
+ *
+ * This program 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.
+ *
+ * This program 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 this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
 #include "../../base.h"
 
 #if ENABLED(ULTRA_LCD)
diff --git a/MK/module/lcd/ultralcd.h b/MK/module/lcd/ultralcd.h
index ba262371f5b0dd5cb573e3c9f4ffc69752b1470b..d571643d011bb89c089dc0f73e221e7d74440105 100644
--- a/MK/module/lcd/ultralcd.h
+++ b/MK/module/lcd/ultralcd.h
@@ -1,3 +1,25 @@
+/**
+ * MK & MK4due 3D Printer Firmware
+ *
+ * Based on Marlin, Sprinter and grbl
+ * Copyright (C) 2011 Camiel Gubbels / Erik van der Zalm
+ * Copyright (C) 2013 - 2016 Alberto Cotronei @MagoKimbra
+ *
+ * This program 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.
+ *
+ * This program 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 this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
 #ifndef ULTRALCD_H
 #define ULTRALCD_H
 
diff --git a/MK/module/lcd/ultralcd_implementation_hitachi_HD44780.h b/MK/module/lcd/ultralcd_implementation_hitachi_HD44780.h
index b0f033e1708c357d91a7683f43fd5b87153c3a2f..05149e6a9abcde9f8605c93d3b798b7c0a97ceab 100644
--- a/MK/module/lcd/ultralcd_implementation_hitachi_HD44780.h
+++ b/MK/module/lcd/ultralcd_implementation_hitachi_HD44780.h
@@ -1,3 +1,25 @@
+/**
+ * MK & MK4due 3D Printer Firmware
+ *
+ * Based on Marlin, Sprinter and grbl
+ * Copyright (C) 2011 Camiel Gubbels / Erik van der Zalm
+ * Copyright (C) 2013 - 2016 Alberto Cotronei @MagoKimbra
+ *
+ * This program 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.
+ *
+ * This program 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 this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
 #ifndef ULTRALCD_IMPLEMENTATION_HITACHI_HD44780_H
 #define ULTRALCD_IMPLEMENTATION_HITACHI_HD44780_H
 
diff --git a/MK/module/lcd/ultralcd_st7920_u8glib_rrd.h b/MK/module/lcd/ultralcd_st7920_u8glib_rrd.h
index b51e8cd225522594f999bf1b061072af308fa482..985dbddb590a7c9f991ac949073406b7b3297b6e 100644
--- a/MK/module/lcd/ultralcd_st7920_u8glib_rrd.h
+++ b/MK/module/lcd/ultralcd_st7920_u8glib_rrd.h
@@ -1,3 +1,25 @@
+/**
+ * MK & MK4due 3D Printer Firmware
+ *
+ * Based on Marlin, Sprinter and grbl
+ * Copyright (C) 2011 Camiel Gubbels / Erik van der Zalm
+ * Copyright (C) 2013 - 2016 Alberto Cotronei @MagoKimbra
+ *
+ * This program 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.
+ *
+ * This program 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 this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
 #ifndef ULCDST7920_H
 #define ULCDST7920_H
 
diff --git a/MK/module/macros.h b/MK/module/macros.h
index 6d2f7dd9dcd167926d95f3acccdc47c451a2ec50..cc53bdb8f36a07147c812368affb914b59d9b978 100644
--- a/MK/module/macros.h
+++ b/MK/module/macros.h
@@ -1,3 +1,25 @@
+/**
+ * MK & MK4due 3D Printer Firmware
+ *
+ * Based on Marlin, Sprinter and grbl
+ * Copyright (C) 2011 Camiel Gubbels / Erik van der Zalm
+ * Copyright (C) 2013 - 2016 Alberto Cotronei @MagoKimbra
+ *
+ * This program 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.
+ *
+ * This program 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 this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
 #ifndef MACROS_H
 #define MACROS_H
 
@@ -44,4 +66,7 @@
 // Function macro
 #define  FORCE_INLINE __attribute__((always_inline)) inline
 
+// Macro for debugging
+#define DEBUGGING(F) (mk_debug_flags & (DEBUG_## F))
+
 #endif //__MACROS_H
diff --git a/MK/module/mechanics.h b/MK/module/mechanics.h
index df14ee8f18dc38c8b6a3dbe6e5e30313f553977b..1f023e647841d9af5f6113b2bee584a92b7e175d 100644
--- a/MK/module/mechanics.h
+++ b/MK/module/mechanics.h
@@ -1,3 +1,25 @@
+/**
+ * MK & MK4due 3D Printer Firmware
+ *
+ * Based on Marlin, Sprinter and grbl
+ * Copyright (C) 2011 Camiel Gubbels / Erik van der Zalm
+ * Copyright (C) 2013 - 2016 Alberto Cotronei @MagoKimbra
+ *
+ * This program 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.
+ *
+ * This program 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 this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
 #ifndef MECHANICS_H
 #define MECHANICS_H
 
diff --git a/MK/module/motion/cartesian_correction.cpp b/MK/module/motion/cartesian_correction.cpp
index 4be27e044346091680cf9941747164111b1050d1..2781795caf508243ff4cac794ce7c772cf43cc5e 100644
--- a/MK/module/motion/cartesian_correction.cpp
+++ b/MK/module/motion/cartesian_correction.cpp
@@ -1,11 +1,33 @@
+/**
+ * MK & MK4due 3D Printer Firmware
+ *
+ * Based on Marlin, Sprinter and grbl
+ * Copyright (C) 2011 Camiel Gubbels / Erik van der Zalm
+ * Copyright (C) 2013 - 2016 Alberto Cotronei @MagoKimbra
+ *
+ * This program 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.
+ *
+ * This program 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 this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
 /**
  * cartesian_correction.cpp
  * A class that manages hysteresis by inserting extra plan_buffer_line when necessary
  * A class that manages ZWobble
  *
- * Copyright (c) 2016 MagoKimbra
- * Copyright (c) 2013 Francesco Santini
  * Copyright (c) 2012 Neil James Martin
+ * Copyright (c) 2013 Francesco Santini
+ * Copyright (c) 2016 MagoKimbra
  *
  * Grbl 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/MK/module/motion/cartesian_correction.h b/MK/module/motion/cartesian_correction.h
index 9ac25a3d540c8a2aeaef4ce9222b2f4a8034ab2a..31f70d9d3375b7fdc0bfe123f76e7bce1955c99d 100644
--- a/MK/module/motion/cartesian_correction.h
+++ b/MK/module/motion/cartesian_correction.h
@@ -1,11 +1,33 @@
+/**
+ * MK & MK4due 3D Printer Firmware
+ *
+ * Based on Marlin, Sprinter and grbl
+ * Copyright (C) 2011 Camiel Gubbels / Erik van der Zalm
+ * Copyright (C) 2013 - 2016 Alberto Cotronei @MagoKimbra
+ *
+ * This program 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.
+ *
+ * This program 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 this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
 /**
  * cartesian_correction.h
  * A class that manages hysteresis by inserting extra plan_buffer_line when necessary
  * A class that manages ZWobble
  *
- * Copyright (c) 2016 MagoKimbra
- * Copyright (c) 2013 Francesco Santini
  * Copyright (c) 2012 Neil James Martin
+ * Copyright (c) 2013 Francesco Santini
+ * Copyright (c) 2016 MagoKimbra
  *
  * Grbl 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/MK/module/motion/planner.cpp b/MK/module/motion/planner.cpp
index 87a10ab29a0aae0160e5df7f1a31c594ea0efc01..9dca6b2a58fb116db21b63c136dd99f1c1dbb6bf 100644
--- a/MK/module/motion/planner.cpp
+++ b/MK/module/motion/planner.cpp
@@ -1,3 +1,25 @@
+/**
+ * MK4due 3D Printer Firmware
+ *
+ * Based on Marlin, Sprinter and grbl
+ * Copyright (C) 2011 Camiel Gubbels / Erik van der Zalm
+ * Copyright (C) 2013 - 2016 Alberto Cotronei @MagoKimbra
+ *
+ * This program 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.
+ *
+ * This program 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 this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
 /**
  * planner.cpp - Buffer movement commands and manage the acceleration profile plan
  * Part of Grbl
@@ -151,8 +173,8 @@ FORCE_INLINE float intersection_distance(float initial_rate, float final_rate, f
 // Calculates trapezoid parameters so that the entry- and exit-speed is compensated by the provided factors.
 
 void calculate_trapezoid_for_block(block_t* block, float entry_factor, float exit_factor) {
-  unsigned long initial_rate = ceil(block->nominal_rate * entry_factor); // (step/min)
-  unsigned long final_rate = ceil(block->nominal_rate * exit_factor); // (step/min)
+  unsigned long initial_rate = ceil(block->nominal_rate * entry_factor),
+                final_rate = ceil(block->nominal_rate * exit_factor); // (steps per second)
 
   // Limit minimal step rate (Otherwise the timer will overflow.)
   NOLESS(initial_rate, 120);
@@ -553,7 +575,7 @@ float junction_deviation = 0.1;
       #endif
         {
           if (degHotend(extruder) < extrude_min_temp && !(DEBUGGING(DRYRUN))) {
-            position[E_AXIS] = target[E_AXIS]; //behave as if the move really took place, but ignore E part
+            position[E_AXIS] = target[E_AXIS]; // Behave as if the move really took place, but ignore E part
             de = 0; // no difference
             ECHO_LM(ER, SERIAL_ERR_COLD_EXTRUDE_STOP);
           }
@@ -643,10 +665,10 @@ float junction_deviation = 0.1;
     if (dc < 0) SBI(dirb, C_AXIS); // Motor B direction
   #else
     if (dx < 0) SBI(dirb, X_AXIS);
-    if (dy < 0) SBI(dirb, Y_AXIS); 
+    if (dy < 0) SBI(dirb, Y_AXIS);
     if (dz < 0) SBI(dirb, Z_AXIS);
   #endif
-  if (de < 0) SBI(dirb, E_AXIS); 
+  if (de < 0) SBI(dirb, E_AXIS);
   block->direction_bits = dirb;
 
   block->active_driver = driver;
@@ -969,7 +991,7 @@ float junction_deviation = 0.1;
 
   // Compute and limit the acceleration rate for the trapezoid generator.
   float steps_per_mm = block->step_event_count / block->millimeters;
-  long bsx = block->steps[X_AXIS], bsy = block->steps[Y_AXIS], bsz = block->steps[Z_AXIS], bse = block->steps[E_AXIS];
+  unsigned long bsx = block->steps[X_AXIS], bsy = block->steps[Y_AXIS], bsz = block->steps[Z_AXIS], bse = block->steps[E_AXIS];
   if (bsx == 0 && bsy == 0 && bsz == 0) {
     block->acceleration_st = ceil(retract_acceleration[extruder] * steps_per_mm); // convert to: acceleration steps/sec^2
   }
@@ -984,11 +1006,12 @@ float junction_deviation = 0.1;
                 xsteps = axis_steps_per_sqr_second[X_AXIS],
                 ysteps = axis_steps_per_sqr_second[Y_AXIS],
                 zsteps = axis_steps_per_sqr_second[Z_AXIS],
-                esteps = axis_steps_per_sqr_second[E_AXIS + extruder];
-  if ((float)acc_st * bsx / block->step_event_count > xsteps) acc_st = xsteps;
-  if ((float)acc_st * bsy / block->step_event_count > ysteps) acc_st = ysteps;
-  if ((float)acc_st * bsz / block->step_event_count > zsteps) acc_st = zsteps;
-  if ((float)acc_st * bse / block->step_event_count > esteps) acc_st = esteps;
+                esteps = axis_steps_per_sqr_second[E_AXIS + extruder],
+                allsteps = block->step_event_count;
+  if (xsteps < (acc_st * bsx) / allsteps) acc_st = (xsteps * allsteps) / bsx;
+  if (ysteps < (acc_st * bsy) / allsteps) acc_st = (ysteps * allsteps) / bsy;
+  if (zsteps < (acc_st * bsz) / allsteps) acc_st = (zsteps * allsteps) / bsz;
+  if (esteps < (acc_st * bse) / allsteps) acc_st = (esteps * allsteps) / bse;
 
   block->acceleration_st = acc_st;
   block->acceleration = acc_st / steps_per_mm;
@@ -1010,7 +1033,7 @@ float junction_deviation = 0.1;
     // Compute maximum allowable entry speed at junction by centripetal acceleration approximation.
     // Let a circle be tangent to both previous and current path line segments, where the junction
     // deviation is defined as the distance from the junction to the closest edge of the circle,
-    // colinear with the circle center. The circular segment joining the two paths represents the
+    // collinear with the circle center. The circular segment joining the two paths represents the
     // path of centripetal acceleration. Solve for max velocity based on max acceleration about the
     // radius of the circle, defined indirectly by junction deviation. This may be also viewed as
     // path width or max_jerk in the previous grbl version. This approach does not actually deviate
@@ -1094,7 +1117,7 @@ float junction_deviation = 0.1;
     }
     else {
       long acc_dist = estimate_acceleration_distance(0, block->nominal_rate, block->acceleration_st);
-      float advance = (STEPS_PER_CUBIC_MM_E * EXTRUDER_ADVANCE_K) * (cse * cse * EXTRUSION_AREA * EXTRUSION_AREA) * 256;
+      float advance = ((STEPS_PER_CUBIC_MM_E) * (EXTRUDER_ADVANCE_K)) * (cse * cse * (EXTRUSION_AREA) * (EXTRUSION_AREA)) * 256;
       block->advance = advance;
       block->advance_rate = acc_dist ? advance / (float)acc_dist : 0;
     }
@@ -1119,6 +1142,11 @@ float junction_deviation = 0.1;
 } // plan_buffer_line()
 
 #if ENABLED(AUTO_BED_LEVELING_FEATURE)
+  /**
+   * Get the XYZ position of the steppers as a vector_3.
+   *
+   * On CORE machines XYZ is derived from ABC.
+   */
   vector_3 plan_get_position() {
     vector_3 position = vector_3(st_get_axis_position_mm(X_AXIS), st_get_axis_position_mm(Y_AXIS), st_get_axis_position_mm(Z_AXIS));
 
@@ -1133,6 +1161,11 @@ float junction_deviation = 0.1;
   }
 #endif // AUTO_BED_LEVELING_FEATURE
 
+/**
+ * Directly set the planner XYZ position (hence the stepper positions).
+ *
+ * On CORE machines stepper ABC will be translated from the given XYZ.
+ */
 #if ENABLED(AUTO_BED_LEVELING_FEATURE)
   void plan_set_position(float x, float y, float z, const float& e)
 #else
diff --git a/MK/module/motion/planner.h b/MK/module/motion/planner.h
index 04b643b6294ba291bdc0b75bd00447ee8d4633d3..9d062ae4e1bcf92250de03e7b85c0fe961fb7e3a 100644
--- a/MK/module/motion/planner.h
+++ b/MK/module/motion/planner.h
@@ -1,22 +1,44 @@
-/*
-  planner.h - buffers movement commands and manages the acceleration profile plan
-  Part of Grbl
-
-  Copyright (c) 2009-2011 Simen Svale Skogsrud
-
-  Grbl 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.
-
-  Grbl 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 Grbl.  If not, see <http://www.gnu.org/licenses/>.
-*/
+/**
+ * MK & MK4due 3D Printer Firmware
+ *
+ * Based on Marlin, Sprinter and grbl
+ * Copyright (C) 2011 Camiel Gubbels / Erik van der Zalm
+ * Copyright (C) 2013 - 2016 Alberto Cotronei @MagoKimbra
+ *
+ * This program 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.
+ *
+ * This program 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 this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+/**
+ * planner.h - Buffer movement commands and manages the acceleration profile plan
+ * Part of Grbl
+ *
+ * Copyright (c) 2009-2011 Simen Svale Skogsrud
+ *
+ * Grbl 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.
+ *
+ * Grbl 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 Grbl.  If not, see <http://www.gnu.org/licenses/>.
+ */
 
 // This module is to be considered a sub-module of stepper.c. Please don't include
 // this file from any other module.
diff --git a/MK/module/motion/qr_solve.cpp b/MK/module/motion/qr_solve.cpp
index e640e85e89023c11834e1119b607db5973e86b6d..b59b0b38a119a123e08022df4e879c1251cfc7f2 100644
--- a/MK/module/motion/qr_solve.cpp
+++ b/MK/module/motion/qr_solve.cpp
@@ -1,3 +1,25 @@
+/**
+ * MK & MK4due 3D Printer Firmware
+ *
+ * Based on Marlin, Sprinter and grbl
+ * Copyright (C) 2011 Camiel Gubbels / Erik van der Zalm
+ * Copyright (C) 2013 - 2016 Alberto Cotronei @MagoKimbra
+ *
+ * This program 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.
+ *
+ * This program 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 this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
 #include "../../base.h"
 
 #if ENABLED(AUTO_BED_LEVELING_FEATURE) && ENABLED(AUTO_BED_LEVELING_GRID)
diff --git a/MK/module/motion/qr_solve.h b/MK/module/motion/qr_solve.h
index 5dd1ca7b643dfeb96781a8bf37055e71d87bb8ae..c0e8babb8826b13bb35b09d952a9fe679956cb2b 100644
--- a/MK/module/motion/qr_solve.h
+++ b/MK/module/motion/qr_solve.h
@@ -1,3 +1,25 @@
+/**
+ * MK & MK4due 3D Printer Firmware
+ *
+ * Based on Marlin, Sprinter and grbl
+ * Copyright (C) 2011 Camiel Gubbels / Erik van der Zalm
+ * Copyright (C) 2013 - 2016 Alberto Cotronei @MagoKimbra
+ *
+ * This program 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.
+ *
+ * This program 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 this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
 #if ENABLED(AUTO_BED_LEVELING_GRID)
 
   void daxpy(int n, double da, double dx[], int incx, double dy[], int incy);
diff --git a/MK/module/motion/stepper.cpp b/MK/module/motion/stepper.cpp
index 42ca7fee161522ffb3c8a8b76ea702f1cec1c74d..f53a968ae350130bccc58e9da4c59fabe708ba37 100644
--- a/MK/module/motion/stepper.cpp
+++ b/MK/module/motion/stepper.cpp
@@ -1,26 +1,30 @@
 /**
- * stepper.cpp - stepper motor driver: executes motion plans using stepper motors
- * Marlin Firmware
+ * MK & MK4due 3D Printer Firmware
  *
- * Derived from Grbl
- * Copyright (c) 2009-2011 Simen Svale Skogsrud
+ * Based on Marlin, Sprinter and grbl
+ * Copyright (C) 2011 Camiel Gubbels / Erik van der Zalm
+ * Copyright (C) 2013 - 2016 Alberto Cotronei @MagoKimbra
  *
- * Grbl is free software: you can redistribute it and/or modify
+ * This program 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.
  *
- * Grbl is distributed in the hope that it will be useful,
+ * This program 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 Grbl.  If not, see <http://www.gnu.org/licenses/>.
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
  */
 
-/* The timer calculations of this module informed by the 'RepRap cartesian firmware' by Zack Smith
-   and Philipp Tiefenbacher. */
+/**
+ * stepper.cpp - stepper motor driver: executes motion plans using stepper motors
+ * The timer calculations of this module informed by the 'RepRap cartesian firmware' by Zack Smith
+ * and Philipp Tiefenbacher.
+ */
 
 #include "../../base.h"
 #include "stepper.h"
diff --git a/MK/module/motion/stepper.h b/MK/module/motion/stepper.h
index ad534c80a17e464835f5591b9468c660c1f5e6b4..c2abee728f6f037a41d06687415babee64d5b1d6 100644
--- a/MK/module/motion/stepper.h
+++ b/MK/module/motion/stepper.h
@@ -1,23 +1,28 @@
 /**
- * stepper.h - stepper motor driver: executes motion plans of planner.c using the stepper motors
- * Part of Grbl
+ * MK & MK4due 3D Printer Firmware
  *
- * Copyright (c) 2009-2011 Simen Svale Skogsrud
+ * Based on Marlin, Sprinter and grbl
+ * Copyright (C) 2011 Camiel Gubbels / Erik van der Zalm
+ * Copyright (C) 2013 - 2016 Alberto Cotronei @MagoKimbra
  *
- * Grbl is free software: you can redistribute it and/or modify
+ * This program 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.
  *
- * Grbl is distributed in the hope that it will be useful,
+ * This program 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 Grbl.  If not, see <http://www.gnu.org/licenses/>.
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
  */
 
+/**
+ * stepper.h - stepper motor driver: executes motion plans of planner.c using the stepper motors
+ */
 
 #ifndef STEPPER_H
   #define STEPPER_H 
diff --git a/MK/module/motion/stepper_indirection.cpp b/MK/module/motion/stepper_indirection.cpp
index 06cf5043cb27e8f06d19916f3d922b4c11936db8..0505aad471fbec5ff07708e33c50645db0aa24ff 100644
--- a/MK/module/motion/stepper_indirection.cpp
+++ b/MK/module/motion/stepper_indirection.cpp
@@ -1,23 +1,32 @@
-/*
-  stepper_indirection.c - stepper motor driver indirection 
-  to allow some stepper functions to be done via SPI/I2c instead of direct pin manipulation
-  Part of Marlin
+/**
+ * MK & MK4due 3D Printer Firmware
+ *
+ * Based on Marlin, Sprinter and grbl
+ * Copyright (C) 2011 Camiel Gubbels / Erik van der Zalm
+ * Copyright (C) 2013 - 2016 Alberto Cotronei @MagoKimbra
+ *
+ * This program 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.
+ *
+ * This program 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 this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
 
-  Copyright (c) 2015 Dominik Wenger
-
-  Marlin 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.
-
-  Marlin 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 Marlin.  If not, see <http://www.gnu.org/licenses/>.
-*/
+/**
+ * stepper_indirection.c - stepper motor driver indirection 
+ * to allow some stepper functions to be done via SPI/I2c instead of direct pin manipulation
+ *
+ * Copyright (c) 2015 Dominik Wenger
+ *
+ */
 
 #include "../../base.h"
 #include "stepper_indirection.h"
diff --git a/MK/module/motion/stepper_indirection.h b/MK/module/motion/stepper_indirection.h
index 55d0a09c6d593f7232c5da8db9db1f47788d1f70..d9a2680608f97b7bbd061cdef1c4701cc19d217f 100644
--- a/MK/module/motion/stepper_indirection.h
+++ b/MK/module/motion/stepper_indirection.h
@@ -1,23 +1,32 @@
-/*
-  stepper_indirection.h - stepper motor driver indirection macros
-  to allow some stepper functions to be done via SPI/I2c instead of direct pin manipulation
-  Part of Marlin
-
-  Copyright (c) 2015 Dominik Wenger
-
-  Marlin 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.
-
-  Marlin 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 Marlin.  If not, see <http://www.gnu.org/licenses/>.
-*/
+/**
+ * MK & MK4due 3D Printer Firmware
+ *
+ * Based on Marlin, Sprinter and grbl
+ * Copyright (C) 2011 Camiel Gubbels / Erik van der Zalm
+ * Copyright (C) 2013 - 2016 Alberto Cotronei @MagoKimbra
+ *
+ * This program 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.
+ *
+ * This program 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 this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+/**
+ * stepper_indirection.h - stepper motor driver indirection macros
+ * to allow some stepper functions to be done via SPI/I2c instead of direct pin manipulation
+ *
+ * Copyright (c) 2015 Dominik Wenger
+ *
+ */
 
 #ifndef STEPPER_INDIRECTION_H
 #define STEPPER_INDIRECTION_H
diff --git a/MK/module/motion/vector_3.cpp b/MK/module/motion/vector_3.cpp
index c045704d142f73e8cc4d754e8728cbc8e8c1c3d3..d80bcd36f388bb936549e3d5deb5779cfcaca82a 100644
--- a/MK/module/motion/vector_3.cpp
+++ b/MK/module/motion/vector_3.cpp
@@ -1,3 +1,25 @@
+/**
+ * MK & MK4due 3D Printer Firmware
+ *
+ * Based on Marlin, Sprinter and grbl
+ * Copyright (C) 2011 Camiel Gubbels / Erik van der Zalm
+ * Copyright (C) 2013 - 2016 Alberto Cotronei @MagoKimbra
+ *
+ * This program 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.
+ *
+ * This program 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 this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
 /**
  * vector_3.cpp - Vector library for bed leveling
  * Copyright (c) 2012 Lars Brubaker.  All right reserved.
diff --git a/MK/module/motion/vector_3.h b/MK/module/motion/vector_3.h
index 4eaa17dc95d065426ed187624873ae7fc135986f..37d13e4efa354d1dd36b03f0c76b5b262e072fe0 100644
--- a/MK/module/motion/vector_3.h
+++ b/MK/module/motion/vector_3.h
@@ -1,3 +1,25 @@
+/**
+ * MK & MK4due 3D Printer Firmware
+ *
+ * Based on Marlin, Sprinter and grbl
+ * Copyright (C) 2011 Camiel Gubbels / Erik van der Zalm
+ * Copyright (C) 2013 - 2016 Alberto Cotronei @MagoKimbra
+ *
+ * This program 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.
+ *
+ * This program 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 this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
 /**
  * vector_3.cpp - Vector library for bed leveling
  * Copyright (c) 2012 Lars Brubaker.  All right reserved.
diff --git a/MK/module/nextion/Nextion_lcd.cpp b/MK/module/nextion/Nextion_lcd.cpp
index 452139786c66974bee8597ad96de2b4feeeb31f4..37c17ba5e55af45a236eb1ba66e31fc1f6a5e03a 100644
--- a/MK/module/nextion/Nextion_lcd.cpp
+++ b/MK/module/nextion/Nextion_lcd.cpp
@@ -1,3 +1,44 @@
+/**
+ * MK & MK4due 3D Printer Firmware
+ *
+ * Based on Marlin, Sprinter and grbl
+ * Copyright (C) 2011 Camiel Gubbels / Erik van der Zalm
+ * Copyright (C) 2013 - 2016 Alberto Cotronei @MagoKimbra
+ *
+ * This program 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.
+ *
+ * This program 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 this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+/**
+ * Nextion_lcd.cpp
+ *
+ * Copyright (c) 2014-2016 Alberto Cotronei @MagoKimbra
+ *
+ * Grbl 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.
+ *
+ * Grbl 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 Grbl.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
 #include "../../base.h"
 
 #if ENABLED(NEXTION)
diff --git a/MK/module/nextion/Nextion_lcd.h b/MK/module/nextion/Nextion_lcd.h
index ee761291a1561becc68b3aa6427acdc8205c0853..23b805b76ed5c787acece03359c9b117d750f47e 100644
--- a/MK/module/nextion/Nextion_lcd.h
+++ b/MK/module/nextion/Nextion_lcd.h
@@ -1,3 +1,44 @@
+/**
+ * MK & MK4due 3D Printer Firmware
+ *
+ * Based on Marlin, Sprinter and grbl
+ * Copyright (C) 2011 Camiel Gubbels / Erik van der Zalm
+ * Copyright (C) 2013 - 2016 Alberto Cotronei @MagoKimbra
+ *
+ * This program 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.
+ *
+ * This program 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 this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+ /**
+ * Nextion_lcd.h
+ *
+ * Copyright (c) 2014-2016 Alberto Cotronei @MagoKimbra
+ *
+ * Grbl 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.
+ *
+ * Grbl 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 Grbl.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
 #ifndef NEXTIONLCD_H
   #define NEXTIONLCD_H
 
diff --git a/MK/module/pins.h b/MK/module/pins.h
index ddb1c4d27c125da73dd9b00808aed54ae8dc8e19..ba00d7a6fcaa1a248b751decb776b088d1f7c652 100644
--- a/MK/module/pins.h
+++ b/MK/module/pins.h
@@ -1,5 +1,23 @@
 /**
- * pins.h
+ * MK & MK4due 3D Printer Firmware
+ *
+ * Based on Marlin, Sprinter and grbl
+ * Copyright (C) 2011 Camiel Gubbels / Erik van der Zalm
+ * Copyright (C) 2013 - 2016 Alberto Cotronei @MagoKimbra
+ *
+ * This program 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.
+ *
+ * This program 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 this program. If not, see <http://www.gnu.org/licenses/>.
+ *
  */
 
 #ifndef PINS_H
diff --git a/MK/module/sanitycheck.h b/MK/module/sanitycheck.h
index b2e378789e0a21f55bd34cf861cef93136d408f9..70b04dbeb88cef88a15c1a5c83f4bfe669bd9333 100644
--- a/MK/module/sanitycheck.h
+++ b/MK/module/sanitycheck.h
@@ -1,3 +1,25 @@
+/**
+ * MK & MK4due 3D Printer Firmware
+ *
+ * Based on Marlin, Sprinter and grbl
+ * Copyright (C) 2011 Camiel Gubbels / Erik van der Zalm
+ * Copyright (C) 2013 - 2016 Alberto Cotronei @MagoKimbra
+ *
+ * This program 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.
+ *
+ * This program 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 this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
 /**
  * sanitycheck.h
  *
diff --git a/MK/module/sd/SDFat.cpp b/MK/module/sd/SDFat.cpp
index 3a92ff46b04b8f894dfa508def14a684ffecdac7..15a9b6a0c975f072e414a981f16eba72c2912cd0 100644
--- a/MK/module/sd/SDFat.cpp
+++ b/MK/module/sd/SDFat.cpp
@@ -1,4 +1,27 @@
-/* Arduino SdFat Library
+/**
+ * MK & MK4due 3D Printer Firmware
+ *
+ * Based on Marlin, Sprinter and grbl
+ * Copyright (C) 2011 Camiel Gubbels / Erik van der Zalm
+ * Copyright (C) 2013 - 2016 Alberto Cotronei @MagoKimbra
+ *
+ * This program 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.
+ *
+ * This program 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 this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+/**
+ * Arduino SdFat Library
  * Copyright (C) 2012 by William Greiman
  *
  * This file is part of the Arduino SdFat Library
diff --git a/MK/module/sd/SDFat.h b/MK/module/sd/SDFat.h
index d7752ef01c2567635faed3a4ac9870da1dfc1418..f8b69dbed3a8568088353db23906b848268038ce 100644
--- a/MK/module/sd/SDFat.h
+++ b/MK/module/sd/SDFat.h
@@ -1,4 +1,27 @@
-/* Arduino SdFat Library
+/**
+ * MK & MK4due 3D Printer Firmware
+ *
+ * Based on Marlin, Sprinter and grbl
+ * Copyright (C) 2011 Camiel Gubbels / Erik van der Zalm
+ * Copyright (C) 2013 - 2016 Alberto Cotronei @MagoKimbra
+ *
+ * This program 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.
+ *
+ * This program 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 this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+/**
+ * Arduino SdFat Library
  * Copyright (C) 2012 by William Greiman
  *
  * This file is part of the Arduino SdFat Library
diff --git a/MK/module/sd/cardreader.cpp b/MK/module/sd/cardreader.cpp
index a3e8968ed324972a8f027eda61aafdd1ca87ed2e..0ece01ed28acef2ebfbfc96ed586af0ff70665e6 100644
--- a/MK/module/sd/cardreader.cpp
+++ b/MK/module/sd/cardreader.cpp
@@ -1,3 +1,25 @@
+/**
+ * MK & MK4due 3D Printer Firmware
+ *
+ * Based on Marlin, Sprinter and grbl
+ * Copyright (C) 2011 Camiel Gubbels / Erik van der Zalm
+ * Copyright (C) 2013 - 2016 Alberto Cotronei @MagoKimbra
+ *
+ * This program 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.
+ *
+ * This program 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 this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
 #include "../../base.h"
 
 #if ENABLED(SDSUPPORT)
diff --git a/MK/module/sd/cardreader.h b/MK/module/sd/cardreader.h
index ba7e4c075d515fd05d745d9b29b0c9415b281ccb..8a8f9c5a1b88be10540d49e858cc7e741ad36b65 100644
--- a/MK/module/sd/cardreader.h
+++ b/MK/module/sd/cardreader.h
@@ -1,3 +1,25 @@
+/**
+ * MK & MK4due 3D Printer Firmware
+ *
+ * Based on Marlin, Sprinter and grbl
+ * Copyright (C) 2011 Camiel Gubbels / Erik van der Zalm
+ * Copyright (C) 2013 - 2016 Alberto Cotronei @MagoKimbra
+ *
+ * This program 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.
+ *
+ * This program 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 this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
 #ifndef CARDREADER_H
 #define CARDREADER_H
 
diff --git a/MK/module/servo/ServoTimers.h b/MK/module/servo/ServoTimers.h
index fec15e2de4ca27ca3c7fbf403b7374d88b41e6e8..98def1169249dfccdce3a92079f5fd8f35d5f339 100644
--- a/MK/module/servo/ServoTimers.h
+++ b/MK/module/servo/ServoTimers.h
@@ -1,3 +1,25 @@
+/**
+ * MK & MK4due 3D Printer Firmware
+ *
+ * Based on Marlin, Sprinter and grbl
+ * Copyright (C) 2011 Camiel Gubbels / Erik van der Zalm
+ * Copyright (C) 2013 - 2016 Alberto Cotronei @MagoKimbra
+ *
+ * This program 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.
+ *
+ * This program 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 this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
 /**
  * Copyright (c) 2013 Arduino LLC. All right reserved.
  *
diff --git a/MK/module/servo/servo.cpp b/MK/module/servo/servo.cpp
index 36a2ee4227539c41d22bc3a87bfd2f4049d4a57d..6bd6a66531f6adea133593593c67ca33382ee8da 100644
--- a/MK/module/servo/servo.cpp
+++ b/MK/module/servo/servo.cpp
@@ -1,3 +1,25 @@
+/**
+ * MK & MK4due 3D Printer Firmware
+ *
+ * Based on Marlin, Sprinter and grbl
+ * Copyright (C) 2011 Camiel Gubbels / Erik van der Zalm
+ * Copyright (C) 2013 - 2016 Alberto Cotronei @MagoKimbra
+ *
+ * This program 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.
+ *
+ * This program 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 this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
 /**
  * Copyright (c) 2013 Arduino LLC. All right reserved.
  *
diff --git a/MK/module/servo/servo.h b/MK/module/servo/servo.h
index bbab5a7302a36b08bd713f103c75368f248381e7..f34e161019caf09edcd76fd51346d0e37dc01afe 100644
--- a/MK/module/servo/servo.h
+++ b/MK/module/servo/servo.h
@@ -1,23 +1,45 @@
-/*
-  servo.h - Interrupt driven Servo library for Arduino using 16 bit timers- Version 2
-  Copyright (c) 2009 Michael Margolis.  All right reserved.
-
-  This library is free software; you can redistribute it and/or
-  modify it under the terms of the GNU Lesser General Public
-  License as published by the Free Software Foundation; either
-  version 2.1 of the License, or (at your option) any later version.
-
-  This library 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
-  Lesser General Public License for more details.
-
-  You should have received a copy of the GNU Lesser General Public
-  License along with this library; if not, write to the Free Software
-  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-*/
-
-/*
+/**
+ * MK & MK4due 3D Printer Firmware
+ *
+ * Based on Marlin, Sprinter and grbl
+ * Copyright (C) 2011 Camiel Gubbels / Erik van der Zalm
+ * Copyright (C) 2013 - 2016 Alberto Cotronei @MagoKimbra
+ *
+ * This program 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.
+ *
+ * This program 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 this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+/**
+ * servo.h - Interrupt driven Servo library for Arduino using 16 bit timers- Version 2
+ * Copyright (c) 2009 Michael Margolis.  All right reserved.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library 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
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ */
+
+/**
   A servo is activated by creating an instance of the Servo class passing 
   the desired pin to the attach() method.
   The servos are pulsed in the background using the value most recently 
diff --git a/MK/module/stopwatch/stopwatch.cpp b/MK/module/stopwatch/stopwatch.cpp
index b0337c91f75bfbc30da30ce4cd35214b81322665..e8d725cd2171f08046e554ae8077011ac0f93de6 100644
--- a/MK/module/stopwatch/stopwatch.cpp
+++ b/MK/module/stopwatch/stopwatch.cpp
@@ -1,5 +1,5 @@
 /**
- * MK 3D Printer Firmware
+ * MK & MK4due 3D Printer Firmware
  *
  * Based on Marlin, Sprinter and grbl
  * Copyright (C) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/MK/module/stopwatch/stopwatch.h b/MK/module/stopwatch/stopwatch.h
index 1fb72133a6c55cacce13865842a6a939530aefcd..c417d59fdf25024f1060cb99ec1e10cb05d2ad3d 100644
--- a/MK/module/stopwatch/stopwatch.h
+++ b/MK/module/stopwatch/stopwatch.h
@@ -1,5 +1,5 @@
 /**
- * MK 3D Printer Firmware
+ * MK & MK4due 3D Printer Firmware
  *
  * Based on Marlin, Sprinter and grbl
  * Copyright (C) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/MK/module/temperature/temperature.cpp b/MK/module/temperature/temperature.cpp
index b42b3913ba8a8d9654b31b7d7e4795fca2675e60..a29daf96c1a2525c832f4f365001911315ac607f 100644
--- a/MK/module/temperature/temperature.cpp
+++ b/MK/module/temperature/temperature.cpp
@@ -1,4 +1,26 @@
-/*
+/**
+ * MK & MK4due 3D Printer Firmware
+ *
+ * Based on Marlin, Sprinter and grbl
+ * Copyright (C) 2011 Camiel Gubbels / Erik van der Zalm
+ * Copyright (C) 2013 - 2016 Alberto Cotronei @MagoKimbra
+ *
+ * This program 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.
+ *
+ * This program 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 this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+/**
   temperature.cpp - temperature control
   Part of Marlin
 
diff --git a/MK/module/temperature/temperature.h b/MK/module/temperature/temperature.h
index 951b88f715a1ee5ef3ef0d36fd447e0dfda11d3a..1baf6cc403676be6b02bf74c8808b57547a08f09 100644
--- a/MK/module/temperature/temperature.h
+++ b/MK/module/temperature/temperature.h
@@ -1,4 +1,26 @@
-/*
+/**
+ * MK & MK4due 3D Printer Firmware
+ *
+ * Based on Marlin, Sprinter and grbl
+ * Copyright (C) 2011 Camiel Gubbels / Erik van der Zalm
+ * Copyright (C) 2013 - 2016 Alberto Cotronei @MagoKimbra
+ *
+ * This program 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.
+ *
+ * This program 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 this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+/**
   temperature.h - temperature controller
   Part of Marlin
 
diff --git a/MK/module/temperature/thermistortables.h b/MK/module/temperature/thermistortables.h
index feb8b2ec8f6f8f07be15fbdd7075486a37d6ea2b..5e68a63a6984422e2a85d115a2ac2f5c6e206838 100644
--- a/MK/module/temperature/thermistortables.h
+++ b/MK/module/temperature/thermistortables.h
@@ -1,3 +1,25 @@
+/**
+ * MK & MK4due 3D Printer Firmware
+ *
+ * Based on Marlin, Sprinter and grbl
+ * Copyright (C) 2011 Camiel Gubbels / Erik van der Zalm
+ * Copyright (C) 2013 - 2016 Alberto Cotronei @MagoKimbra
+ *
+ * This program 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.
+ *
+ * This program 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 this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
 #ifndef THERMISTORTABLES_H_
 #define THERMISTORTABLES_H_
 
diff --git a/MK/module/watchdog/watchdog.cpp b/MK/module/watchdog/watchdog.cpp
index a4d2d851bcf9d8bad9cbb58bd9a24d0df6cf3ffb..98db7b50ca1bb380d85cb1924e2f60149b603902 100644
--- a/MK/module/watchdog/watchdog.cpp
+++ b/MK/module/watchdog/watchdog.cpp
@@ -1,3 +1,25 @@
+/**
+ * MK & MK4due 3D Printer Firmware
+ *
+ * Based on Marlin, Sprinter and grbl
+ * Copyright (C) 2011 Camiel Gubbels / Erik van der Zalm
+ * Copyright (C) 2013 - 2016 Alberto Cotronei @MagoKimbra
+ *
+ * This program 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.
+ *
+ * This program 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 this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
 #include "../../base.h"
 
 #if ENABLED(USE_WATCHDOG)
diff --git a/MK/module/watchdog/watchdog.h b/MK/module/watchdog/watchdog.h
index 0dc3a956c9c2ba7e3bd1ad009bad869888a41c43..bd1f3a61220a6590c281ac23e868c37505bccbb7 100644
--- a/MK/module/watchdog/watchdog.h
+++ b/MK/module/watchdog/watchdog.h
@@ -1,3 +1,25 @@
+/**
+ * MK & MK4due 3D Printer Firmware
+ *
+ * Based on Marlin, Sprinter and grbl
+ * Copyright (C) 2011 Camiel Gubbels / Erik van der Zalm
+ * Copyright (C) 2013 - 2016 Alberto Cotronei @MagoKimbra
+ *
+ * This program 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.
+ *
+ * This program 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 this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
 #ifndef WATCHDOG_H
   #define WATCHDOG_H
   #include <avr/wdt.h>