diff --git a/.gitignore b/.gitignore
index 0159fd9..5935420 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,5 @@
 .vscode/.browse.c_cpp.db*
 .vscode/c_cpp_properties.json
 .vscode/launch.json
+.pioenvs
+.piolibdeps
diff --git a/.pioenvs/.sconsign.dblite b/.pioenvs/.sconsign.dblite
index 414830b..4df0c63 100644
Binary files a/.pioenvs/.sconsign.dblite and b/.pioenvs/.sconsign.dblite differ
diff --git a/.pioenvs/nodemcu-32s/FrameworkArduino/HardwareSerial.cpp.o b/.pioenvs/nodemcu-32s/FrameworkArduino/HardwareSerial.cpp.o
index 440d6a6..495a5c3 100644
Binary files a/.pioenvs/nodemcu-32s/FrameworkArduino/HardwareSerial.cpp.o and b/.pioenvs/nodemcu-32s/FrameworkArduino/HardwareSerial.cpp.o differ
diff --git a/.pioenvs/nodemcu-32s/FrameworkArduino/WString.cpp.o b/.pioenvs/nodemcu-32s/FrameworkArduino/WString.cpp.o
index a1dc387..4b3bcc8 100644
Binary files a/.pioenvs/nodemcu-32s/FrameworkArduino/WString.cpp.o and b/.pioenvs/nodemcu-32s/FrameworkArduino/WString.cpp.o differ
diff --git a/.pioenvs/nodemcu-32s/FrameworkArduino/esp32-hal-bt.c.o b/.pioenvs/nodemcu-32s/FrameworkArduino/esp32-hal-bt.c.o
index 6e772e9..205e4f6 100644
Binary files a/.pioenvs/nodemcu-32s/FrameworkArduino/esp32-hal-bt.c.o and b/.pioenvs/nodemcu-32s/FrameworkArduino/esp32-hal-bt.c.o differ
diff --git a/.pioenvs/nodemcu-32s/FrameworkArduino/esp32-hal-i2c.c.o b/.pioenvs/nodemcu-32s/FrameworkArduino/esp32-hal-i2c.c.o
index c6af1f6..c71824b 100644
Binary files a/.pioenvs/nodemcu-32s/FrameworkArduino/esp32-hal-i2c.c.o and b/.pioenvs/nodemcu-32s/FrameworkArduino/esp32-hal-i2c.c.o differ
diff --git a/.pioenvs/nodemcu-32s/FrameworkArduino/esp32-hal-misc.c.o b/.pioenvs/nodemcu-32s/FrameworkArduino/esp32-hal-misc.c.o
index 8c75c83..97c6e89 100644
Binary files a/.pioenvs/nodemcu-32s/FrameworkArduino/esp32-hal-misc.c.o and b/.pioenvs/nodemcu-32s/FrameworkArduino/esp32-hal-misc.c.o differ
diff --git a/.pioenvs/nodemcu-32s/firmware.bin b/.pioenvs/nodemcu-32s/firmware.bin
index f508f48..1725b85 100644
Binary files a/.pioenvs/nodemcu-32s/firmware.bin and b/.pioenvs/nodemcu-32s/firmware.bin differ
diff --git a/.pioenvs/nodemcu-32s/firmware.elf b/.pioenvs/nodemcu-32s/firmware.elf
index 4478d55..e154c7b 100644
Binary files a/.pioenvs/nodemcu-32s/firmware.elf and b/.pioenvs/nodemcu-32s/firmware.elf differ
diff --git a/.pioenvs/nodemcu-32s/libFrameworkArduino.a b/.pioenvs/nodemcu-32s/libFrameworkArduino.a
index c40879d..4657a6a 100644
Binary files a/.pioenvs/nodemcu-32s/libFrameworkArduino.a and b/.pioenvs/nodemcu-32s/libFrameworkArduino.a differ
diff --git a/.pioenvs/nodemcu-32s/spiffs.bin b/.pioenvs/nodemcu-32s/spiffs.bin
index 327d849..fc9bcca 100644
Binary files a/.pioenvs/nodemcu-32s/spiffs.bin and b/.pioenvs/nodemcu-32s/spiffs.bin differ
diff --git a/.pioenvs/nodemcu-32s/src/BatteryAnalyzer.ino.cpp.o b/.pioenvs/nodemcu-32s/src/BatteryAnalyzer.ino.cpp.o
index b853db0..d198a91 100644
Binary files a/.pioenvs/nodemcu-32s/src/BatteryAnalyzer.ino.cpp.o and b/.pioenvs/nodemcu-32s/src/BatteryAnalyzer.ino.cpp.o differ
diff --git a/.vscode/settings.json b/.vscode/settings.json
index 8ccdeba..56b8276 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -1,6 +1,6 @@
 {
     "terminal.integrated.env.windows": {
-        "PATH": "C:\\Users\\Carsten\\.platformio\\penv\\Scripts;C:\\Users\\Carsten\\.platformio\\penv;C:\\WINDOWS\\system32;C:\\WINDOWS;C:\\WINDOWS\\System32\\Wbem;C:\\WINDOWS\\System32\\WindowsPowerShell\\v1.0\\;C:\\WINDOWS\\System32\\OpenSSH\\;C:\\Program Files (x86)\\NVIDIA Corporation\\PhysX\\Common;C:\\Program Files\\PuTTY\\;C:\\Program Files\\Microsoft VS Code\\bin;C:\\Program Files\\Git\\cmd;C:\\Users\\Carsten\\AppData\\Local\\Microsoft\\WindowsApps;C:\\Program Files (x86)\\Nmap;C:\\WINDOWS\\system32;C:\\WINDOWS;C:\\WINDOWS\\System32\\Wbem;C:\\WINDOWS\\System32\\WindowsPowerShell\\v1.0\\;C:\\WINDOWS\\System32\\OpenSSH\\;C:\\Program Files (x86)\\NVIDIA Corporation\\PhysX\\Common;C:\\Program Files\\PuTTY\\;C:\\Program Files\\Microsoft VS Code\\bin;C:\\Program Files\\Git\\cmd;C:\\Users\\Carsten\\AppData\\Local\\Microsoft\\WindowsApps;C:\\Program Files (x86)\\Nmap",
+        "PATH": "C:\\Users\\Debug\\.platformio\\penv\\Scripts;C:\\Users\\Debug\\.platformio\\penv;C:\\Program Files (x86)\\SIEMENS\\S7-PCT\\bin;C:\\Program Files (x86)\\Common Files\\Siemens\\Sqlany;C:\\Program Files (x86)\\Siemens\\Step7\\S7bin;C:\\Program Files\\Common Files\\Siemens\\Automation\\Simatic OAM\\bin;C:\\Program Files (x86)\\LonWorks\\Bin;C:\\Program Files (x86)\\NVIDIA Corporation\\PhysX\\Common;C:\\Windows\\system32;C:\\Windows;C:\\Windows\\System32\\Wbem;C:\\Windows\\System32\\WindowsPowerShell\\v1.0\\;C:\\Program Files\\PuTTY\\;C:\\Program Files\\Git\\cmd;C:\\AWRoot\\bin\\common;C:\\AWRoot\\bin\\lib;C:\\Program Files\\PKWARE\\pkzipc;C:\\Program Files\\bladeRF\\x64;C:\\Program Files\\Microsoft VS Code\\bin;;C:\\Program Files (x86)\\Microsoft VS Code\\bin;C:\\Program Files (x86)\\Nmap;C:\\Program Files (x86)\\SIEMENS\\S7-PCT\\bin;C:\\Program Files (x86)\\Common Files\\Siemens\\Sqlany;C:\\Program Files (x86)\\Siemens\\Step7\\S7bin;C:\\Program Files\\Common Files\\Siemens\\Automation\\Simatic OAM\\bin;C:\\Program Files (x86)\\LonWorks\\Bin;C:\\Program Files (x86)\\NVIDIA Corporation\\PhysX\\Common;C:\\Windows\\system32;C:\\Windows;C:\\Windows\\System32\\Wbem;C:\\Windows\\System32\\WindowsPowerShell\\v1.0\\;C:\\Program Files\\PuTTY\\;C:\\Program Files\\Git\\cmd;C:\\AWRoot\\bin\\common;C:\\AWRoot\\bin\\lib;C:\\Program Files\\PKWARE\\pkzipc;C:\\Program Files\\bladeRF\\x64;C:\\Program Files\\Microsoft VS Code\\bin;;C:\\Program Files (x86)\\Microsoft VS Code\\bin;C:\\Program Files (x86)\\Nmap",
         "PLATFORMIO_CALLER": "vscode"
     },
     "files.associations": {
diff --git a/data/index.html b/data/index.html
index a8b466e..112c7a4 100644
--- a/data/index.html
+++ b/data/index.html
@@ -17,7 +17,7 @@
 		<div class="row">
 			<div class="col-md-12">
 				<h3>
-					Battery Analyzer / Tracker - v0.3 alpha
+					Battery Analyzer / Tracker - v0.17 alpha
 				</h3>
 				<ul class="nav">
 					<li class="nav-item">
diff --git a/platformio.ini b/platformio.ini
index ccf4ad6..0f052d1 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -14,3 +14,5 @@ board = nodemcu-32s
 framework = arduino
 lib_deps = ArduinoINA219, Wire, EEPROM, TaskScheduler, LiquidCrystal_I2C, ESPAsyncWifiManager, ESP Async WebServer, FS, ESP8266FtpServer
 board_build.partitions = partitions.csv
+monitor_port = COM6
+monitor_speed = 115200
diff --git a/src/BatteryAnalyzer.ino b/src/BatteryAnalyzer.ino
index f86065b..1e60453 100644
--- a/src/BatteryAnalyzer.ino
+++ b/src/BatteryAnalyzer.ino
@@ -26,7 +26,7 @@ FtpServer ftpSrv;
 #define V_BUS_MAX 26
 #define I_MAX_EXPECTED 60
 #define i2c_address 1
-#define led_lowbat_pin 27
+#define led_lowbat_pin 25
 #define led_run_pin 26
 #define button1_pin 14
 #define button2_pin 17
@@ -138,7 +138,7 @@ void setup() {
   lcd.setCursor(7,1);
   lcd.print("Tracker");
   lcd.setCursor(5,2);
-  lcd.print("V0.3 Alpha");
+  lcd.print("V0.17 Alpha");
   lcd.setCursor(7,3);
   lcd.print("CS,2018");
   lcd.write(1);
@@ -165,12 +165,16 @@ void setup() {
 
   //Init Wi-Fi
   lcd.setCursor(0,0);
-  lcd.print("Setup Wi-Fi...");
-  delay(300);
-  AsyncWiFiManager wifiManager(&server,&dns);
-  wifiManager.autoConnect("BatteryAnalyzer WiFi");
-  lcd.setCursor(16,0);
-  lcd.print("Done");
+  if (digitalRead(button3_pin)) {
+    lcd.print("Setup Wi-Fi...");
+    delay(300);
+    AsyncWiFiManager wifiManager(&server,&dns);
+    wifiManager.autoConnect("BatteryAnalyzer WiFi");
+    lcd.setCursor(16,0);
+    lcd.print("Done");
+  } else {
+    lcd.print("Wi-Fi disabled");
+  }
 
   //Init ina219s
   lcd.setCursor(0,1);
@@ -210,7 +214,7 @@ void setup() {
   server.serveStatic("/img", SPIFFS, "/img");
   server.serveStatic("/", SPIFFS, "/").setDefaultFile("index.html");
   server.begin();
-  ftpSrv.begin("esp8266","esp8266"); 
+  ftpSrv.begin("battery","tracker"); 
   delay(500);
   lcd.setCursor(16,2);
   lcd.print("Done");
@@ -300,6 +304,7 @@ void lcd_header() {
     i_header = 0;
     }
   }
+  //Flash Battery Low LED
   if (battery_low && digitalRead(led_lowbat_pin)) {
     digitalWrite(led_lowbat_pin,LOW);
   } else if (battery_low && digitalRead(led_lowbat_pin) == false) { digitalWrite(led_lowbat_pin,HIGH); }
@@ -380,11 +385,13 @@ void readCurrent() {
     reset_actual = false;
   }
   lastread = newtime;
+  ina219.recalibrate();
+  ina219.reconfig();
 }
 
 void read_bat() {
   battery_average += (analogRead(adc_battery_pin) - battery_average) * 0.1;
-  battery_voltage = map(battery_average,0,4096,0,490)/100.0;
+  battery_voltage = map(battery_average,0,4096,0,450)/100.0;
   if (battery_voltage < 3.3 && battery_low == false) {
     battery_low = true;
     lcd.noBacklight();