diff --git a/cores/esp8266/core_esp8266_wiring_shift.c b/cores/esp8266/core_esp8266_wiring_shift.c
index cfe786758..0e4cd2e5e 100644
--- a/cores/esp8266/core_esp8266_wiring_shift.c
+++ b/cores/esp8266/core_esp8266_wiring_shift.c
@@ -4,6 +4,9 @@
 
   Copyright (c) 2005-2006 David A. Mellis
 
+   Note: file renamed with a core_esp8266_ prefix to simplify linker
+  script rules for moving code into irom0_text section.
+
   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
diff --git a/cores/esp8266/sigma_delta.h b/cores/esp8266/sigma_delta.h
index c377c0368..77e574a64 100644
--- a/cores/esp8266/sigma_delta.h
+++ b/cores/esp8266/sigma_delta.h
@@ -1,3 +1,24 @@
+/* 
+  sigma_delta.h - esp8266 sigma-delta source
+
+  Copyright (c) 2014 Ivan Grokhotkov. All rights reserved.
+  This file is part of the esp8266 core for Arduino environment.
+ 
+  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
+*/
+
 #ifndef SIGMA_DELTA_H
 #define SIGMA_DELTA_H
 
diff --git a/cores/esp8266/stdlib_noniso.h b/cores/esp8266/stdlib_noniso.h
index a61447816..842745b1e 100644
--- a/cores/esp8266/stdlib_noniso.h
+++ b/cores/esp8266/stdlib_noniso.h
@@ -1,3 +1,24 @@
+/* 
+  stdlib_noniso.h - nonstandard (but usefull) conversion functions
+
+  Copyright (c) 2014 Ivan Grokhotkov. All rights reserved.
+  This file is part of the esp8266 core for Arduino environment.
+ 
+  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
+*/
+
 #ifndef STDLIB_NONISO_H
 #define STDLIB_NONISO_H
 
diff --git a/libraries/EEPROM/EEPROM.cpp b/libraries/EEPROM/EEPROM.cpp
index b2a0fe70b..74a1a8570 100644
--- a/libraries/EEPROM/EEPROM.cpp
+++ b/libraries/EEPROM/EEPROM.cpp
@@ -1,7 +1,9 @@
-/*
-  EEPROM.cpp - EEPROM library
-  Copyright (c) 2006 David A. Mellis.  All right reserved.
+/* 
+  EEPROM.cpp - esp8266 EEPROM emulation
 
+  Copyright (c) 2014 Ivan Grokhotkov. All rights reserved.
+  This file is part of the esp8266 core for Arduino environment.
+ 
   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
diff --git a/libraries/EEPROM/EEPROM.h b/libraries/EEPROM/EEPROM.h
index b0b69e823..0c7068d1c 100644
--- a/libraries/EEPROM/EEPROM.h
+++ b/libraries/EEPROM/EEPROM.h
@@ -1,7 +1,9 @@
-/*
-  EEPROM.h - EEPROM library
-  Copyright (c) 2006 David A. Mellis.  All right reserved.
+/* 
+  EEPROM.cpp - esp8266 EEPROM emulation
 
+  Copyright (c) 2014 Ivan Grokhotkov. All rights reserved.
+  This file is part of the esp8266 core for Arduino environment.
+ 
   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
diff --git a/libraries/EEPROM/library.properties b/libraries/EEPROM/library.properties
index d1e007085..600ed82b6 100644
--- a/libraries/EEPROM/library.properties
+++ b/libraries/EEPROM/library.properties
@@ -1,8 +1,8 @@
 name=EEPROM
 version=1.0
-author=Arduino
-maintainer=Arduino <info@arduino.cc>
-sentence=Enables reading and writing to the permanent board storage. For all Arduino boards BUT Arduino DUE.
+author=Ivan Grokhotkov
+maintainer=Ivan Grokhotkov
+sentence=Enables reading and writing data to the permanent FLASH storage, up to 4kb.
 paragraph=
 url=http://arduino.cc/en/Reference/EEPROM
 architectures=esp8266
diff --git a/libraries/ESP8266WiFi/src/ESP8266WiFi.cpp b/libraries/ESP8266WiFi/src/ESP8266WiFi.cpp
index 24f743ac0..21657dd03 100644
--- a/libraries/ESP8266WiFi/src/ESP8266WiFi.cpp
+++ b/libraries/ESP8266WiFi/src/ESP8266WiFi.cpp
@@ -1,7 +1,9 @@
-/*
-  WiFi.cpp - Library for Arduino Wifi shield.
-  Copyright (c) 2011-2014 Arduino.  All right reserved.
+/* 
+  ESP8266WiFi.h - WiFi library for esp8266
 
+  Copyright (c) 2014 Ivan Grokhotkov. All rights reserved.
+  This file is part of the esp8266 core for Arduino environment.
+ 
   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
diff --git a/libraries/ESP8266WiFi/src/ESP8266WiFi.h b/libraries/ESP8266WiFi/src/ESP8266WiFi.h
index 2a1725673..37adb93fe 100644
--- a/libraries/ESP8266WiFi/src/ESP8266WiFi.h
+++ b/libraries/ESP8266WiFi/src/ESP8266WiFi.h
@@ -1,6 +1,8 @@
 /*
-  WiFi.h - Library for Arduino Wifi shield.
+  ESP8266WiFi.h - esp8266 Wifi support.
+  Based on WiFi.h from Ardiono WiFi shield library.
   Copyright (c) 2011-2014 Arduino.  All right reserved.
+  Modified by Ivan Grokhotkov, December 2014
 
   This library is free software; you can redistribute it and/or
   modify it under the terms of the GNU Lesser General Public
diff --git a/libraries/ESP8266WiFi/src/include/ClientContext.h b/libraries/ESP8266WiFi/src/include/ClientContext.h
index 277a49f06..6b7aee1f4 100644
--- a/libraries/ESP8266WiFi/src/include/ClientContext.h
+++ b/libraries/ESP8266WiFi/src/include/ClientContext.h
@@ -1,3 +1,23 @@
+/* 
+  ClientContext.h - TCP connection handling on top of lwIP
+
+  Copyright (c) 2014 Ivan Grokhotkov. All rights reserved.
+  This file is part of the esp8266 core for Arduino environment.
+ 
+  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
+*/
 #ifndef CLIENTCONTEXT_H
 #define CLIENTCONTEXT_H