diff --git a/.gitignore b/.gitignore
index e3f4458..8fed545 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,3 +12,4 @@
 *.toc
 *.vrb
 esper-ota.pdf
+.DS_Store
diff --git a/esper-ota.bib b/esper-ota.bib
index 4327504..10a8d66 100755
--- a/esper-ota.bib
+++ b/esper-ota.bib
@@ -1,78 +1,78 @@
 @MISC(ESP8266,
    	author="ESPRESSIF",
    	title="{ESP8266} Overview",
-   	note={\url{http://www.espressif.com/en/products /hardware/esp8266ex/overview}, 2017-01-30},
+   	note={{URL: }\url{http://www.espressif.com/en/products/hardware/esp8266ex/overview}, 2017-05-22},
 )
 
 @MISC(maglab,
 	author="{Magrathea Laboratories e.V.}",
 	title="Magrathea Laboratories - Creating new Worlds",
-	note={\url{https://maglab.space/}, 2016-11-16}
+	note={{URL: }\url{https://maglab.space/}, 2017-05-22}
 )
 
 @MISC(HASS,
 	author="{Home Assistant}",
 	title="Awaken your home",
-	note={\url{http://home-assistant.io/}, 2017-01-02}
+	note={\url{http://home-assistant.io/}, 2017-05-22}
 )
 
 @MISC(ESPer,
 	author="ESPer",
 	title="ESPer - Space Automation Firmware for ESP8266",
-	note={\url{https://git.maglab.space/esper/esper}, 2017-02-02}
+	note={{URL: }\url{https://git.maglab.space/esper/esper}, 2017-05-22}
 )
 
 @MISC(ESP-01s,
 	author="SparkFun",
 	title="{WiFi Module - ESP8266}",
-	note={\url{https://www.sparkfun.com/products/13678}, 2017-10-28}
+	note={{URL: }\url{https://www.sparkfun.com/products/13678}, 2017-05-22}
 )
 
 @MICS(Sming,
 	author="Sming",
 	title="{Sming - Open Source framework for high efficiency native ESP8266 development}",
-	note={\url{http://sminghub.github.io/Sming/about/}, 2016-11-25}
+	note={{URL: }\url{http://sminghub.github.io/Sming/about/}, 2017-05-22}
 )
 
 @MISC(make,
 	author="{The IEEE and The Open Group}",
 	title="The Open Group Base Specifications Issue 6 - make - maintain, update, and regenerate groups of programs",
-	note={\url{http://pubs.opengroup.org/onlinepubs/009695399/utilities/make.html}, 2016-11-27}
+	note={{URL: }\url{http://pubs.opengroup.org/onlinepubs/009695399/utilities/make.html}, 2017-05-22}
 )
 
 @MISC(MQTT,
 	author="{OASIS Standard Incorporating}",
 	title="MQTT Version 3.1.1 Plus Errata 01",
-	note={\url{http://docs.oasis-open.org/mqtt/mqtt/v3.1.1/errata01/os/mqtt-v3.1.1-errata01-os-complete.html}, 2017-01-15}
+	note={{URL: }\url{http://docs.oasis-open.org/mqtt/mqtt/v3.1.1/errata01/os/mqtt-v3.1.1-errata01-os-complete.html}, 2017-05-22}
 )
 
 @MISC(HTTP_1.1,
 	author="{The Internet Society}",
 	title="Hypertext Transfer Protocol -- HTTP/1.1",
-	note={\url{https://www.w3.org/Protocols/rfc2616/rfc2616.html}, 2017-01-15}
+	note={{URL: }\url{https://www.w3.org/Protocols/rfc2616/rfc2616.html}, 2017-05-22}
 )
 
 @MISC(ESP8266_Memory_Map,
 	author="{ESP8266 community wiki}",
 	title="ESP8266 Memory Map",
-	note={\url{http://www.esp8266.com/wiki/doku.php?id=esp8266\_memory\_map}, 2017-01-30}
+	note={{URL: }\url{http://www.esp8266.com/wiki/doku.php?id=esp8266_memory_map}, 2017-05-22}
 )
 
 @MISC(rBoot,
 	author="Richard Antony Burton",
 	title="An open source bootloader for the ESP8266",
-	note={\url{https://github.com/raburton/rboot}, 2017-01-30}
+	note={{URL: }\url{https://github.com/raburton/rboot}, 2017-05-22}
 )
 
 @MICS(drone,
 	author="Drone",
 	title="Drone is a Continuous Delivery platform built on Docker, written in Go",
-	note={\url{https://github.com/drone/drone}, 2017-02-05}
+	note={{URL: }\url{https://github.com/drone/drone}, 2017-05-22}
 )
 
 @article{Ruckebusch:2016vo,
 author = {Ruckebusch, Peter and De Poorter, Eli and Fortuna, Carolina and Moerman, Ingrid},
-title = {{GITAR - Generic extension for Internet-of-Things ARchitectures enabling dynamic updates of network and application modules.}},
+title = {{GITAR - Generic extension for Internet-of-Things Architectures enabling dynamic updates of network and application modules.}},
 journal = {Ad Hoc Networks},
 year = {2016}
 }
diff --git a/esper-ota.tex b/esper-ota.tex
index 73183a8..ee21859 100755
--- a/esper-ota.tex
+++ b/esper-ota.tex
@@ -65,7 +65,7 @@
 \documentclass[10pt,conference,compsocconf]{IEEEtran}
 %\documentclass[10pt]{IEEEtran}
 \usepackage{times}
-
+\usepackage[hyphens]{url}
 \usepackage{caption}
 \captionsetup{font=footnotesize,justification=centering,labelsep=period}