diff --git a/platformio.ini b/platformio.ini
index 8fae8e8..19fe00f 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -4,6 +4,7 @@ platform = espressif32 @ 3.0.0
 framework = arduino
 lib_ldf_mode = deep+
 monitor_speed = 115200
+monitor_filters = esp32_exception_decoder
 lib_deps = 
 	adafruit/Adafruit GFX Library @ 1.7.5
 	adafruit/Adafruit SSD1306 @ 2.4.0
diff --git a/src/LoRa_APRS_Tracker.cpp b/src/LoRa_APRS_Tracker.cpp
index fcde5a0..356e7d5 100644
--- a/src/LoRa_APRS_Tracker.cpp
+++ b/src/LoRa_APRS_Tracker.cpp
@@ -72,20 +72,20 @@ void setup()
 // cppcheck-suppress unusedFunction
 void loop()
 {
-	if(Config.debug == false)
+	if(Config.debug)
 	{
-		while(ss.available() > 0)
+		while(Serial.available() > 0)
 		{
-			char c = ss.read();
+			char c = Serial.read();
 			//Serial.print(c);
 			gps.encode(c);
 		}
 	}
 	else
 	{
-		while(Serial.available() > 0)
+		while(ss.available() > 0)
 		{
-			char c = Serial.read();
+			char c = ss.read();
 			//Serial.print(c);
 			gps.encode(c);
 		}
@@ -201,9 +201,9 @@ void loop()
 			String("Sats: ") + gps.satellites.value() + " HDOP: " + gps.hdop.hdop(),
 			String("Nxt Bcn: ") + createTimeString(nextBeaconTimeStamp)
 #ifdef TTGO_T_Beam_V1_0
-			, String("Bat: ") + batteryVoltage + "V " + batteryChargeCurrent + "mA"
+			, String("Bat: ") + batteryVoltage + "V, " + batteryChargeCurrent + "mA"
 #endif
-			, String("Smart Beacon is " + getSmartBeaconState())
+			, String("Smart Beacon: " + getSmartBeaconState())
 			);
 
 		if(Config.smart_beacon.active)