diff --git a/src/main.cpp b/src/main.cpp
index 207ae7b12..3b327a4e8 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -211,16 +211,16 @@ void setup()
     esp32Setup();
 #endif
 
+#ifdef NRF52_SERIES
+    nrf52Setup();
+#endif
+
     // Currently only the tbeam has a PMU
     power = new Power();
     power->setup();
     power->setStatusHandler(powerStatus);
     powerStatus->observe(&power->newStatus);
 
-#ifdef NRF52_SERIES
-    nrf52Setup();
-#endif
-
     // Init our SPI controller (must be before screen and lora)
     initSPI();
 #ifdef NO_ESP32
diff --git a/src/nrf52/main-nrf52.cpp b/src/nrf52/main-nrf52.cpp
index 40ca6266a..9cce9bd11 100644
--- a/src/nrf52/main-nrf52.cpp
+++ b/src/nrf52/main-nrf52.cpp
@@ -49,14 +49,19 @@ void getMacAddr(uint8_t *dmac)
 NRF52Bluetooth *nrf52Bluetooth;
 
 static bool bleOn = false;
+static const bool enableBle = false; // Set to false for easier debugging
+
 void setBluetoothEnable(bool on)
 {
     if (on != bleOn) {
         if (on) {
             if (!nrf52Bluetooth) {
-                // DEBUG_MSG("DISABLING NRF52 BLUETOOTH WHILE DEBUGGING\n");
-                nrf52Bluetooth = new NRF52Bluetooth();
-                nrf52Bluetooth->setup();
+                if (!enableBle)
+                    DEBUG_MSG("DISABLING NRF52 BLUETOOTH WHILE DEBUGGING\n");
+                else {
+                    nrf52Bluetooth = new NRF52Bluetooth();
+                    nrf52Bluetooth->setup();
+                }
             }
         } else {
             DEBUG_MSG("FIXME: implement BLE disable\n");
@@ -88,6 +93,11 @@ void nrf52Setup()
     // This is the recommended setting for Monitor Mode Debugging
     NVIC_SetPriority(DebugMonitor_IRQn, 6UL);
 
+#ifdef PIN_PWR_ON
+    digitalWrite(PIN_PWR_ON, HIGH); // If we need to assert a pin to power external peripherals
+    pinMode(PIN_PWR_ON, OUTPUT);
+#endif
+
     // Not yet on board
     // pmu.init();
 
diff --git a/variants/eink/variant.h b/variants/eink/variant.h
index f89ac81de..cd1ebd375 100644
--- a/variants/eink/variant.h
+++ b/variants/eink/variant.h
@@ -28,6 +28,7 @@
 /*
 @geeksville eink TODO:
 fix battery pin usage
+drive TCXO DIO3 enable high whenever we want the clock
 */
 
 /*----------------------------------------------------------------------------
@@ -69,24 +70,11 @@ extern "C" {
  * Analog pins
  */
 #define PIN_A0 (4) // Battery ADC
-/* #define PIN_A1 (4) bat adc
-#define PIN_A2 (28)xx
-#define PIN_A3 (29) xx
-#define PIN_A4 (30) xx
-#define PIN_A5 (31) xx
-#define PIN_A6 (0xff)
-#define PIN_A7 (0xff) */
 
 // #define BATTERY_PIN PIN_A0
 
 static const uint8_t A0 = PIN_A0;
-/* static const uint8_t A1 = PIN_A1;
-static const uint8_t A2 = PIN_A2;
-static const uint8_t A3 = PIN_A3;
-static const uint8_t A4 = PIN_A4;
-static const uint8_t A5 = PIN_A5;
-static const uint8_t A6 = PIN_A6;
-static const uint8_t A7 = PIN_A7; */
+
 #define ADC_RESOLUTION 14
 
 // Other pins
@@ -106,9 +94,9 @@ static const uint8_t AREF = PIN_AREF;
 This serial port is _also_ connected to the incoming D+/D- pins from the USB header.  FIXME, figure out how that is supposed to
 work.
 */
-#define PIN_SERIAL1_RX (32 + 9)
-#define PIN_SERIAL1_TX (32 + 8)
-// #define PIN_SERIAL1_EN (0 + 17)
+#define PIN_SERIAL2_RX (32 + 9)
+#define PIN_SERIAL2_TX (32 + 8)
+// #define PIN_SERIAL2_EN (0 + 17)
 
 // Connected to Jlink CDC
 // #define PIN_SERIAL2_RX (8)
@@ -119,7 +107,7 @@ work.
  */
 #define WIRE_INTERFACES_COUNT 1
 
-#define PIN_WIRE_SDA (26)
+#define PIN_WIRE_SDA (26) // Not connected on board?
 #define PIN_WIRE_SCL (27)
 
 /* touch sensor */
@@ -135,12 +123,13 @@ work.
 
 #define SX1262_CS (0 + 24) // FIXME - we really should define LORA_CS instead
 #define SX1262_DIO1 (0 + 20)
-#define SX1262_DIO3 (0 + 22) // FIXME this isn't used yet in the code?
+#define SX1262_DIO3 (0 + 22) // This is TCXO enable
 #define SX1262_BUSY (0 + 25)
 #define SX1262_RESET (32 + 0)
 #define SX1262_E22 // Not really an E22 but TTGO seems to be trying to clone that
 // Internally the TTGO module hooks the SX1262-DIO2 in to control the TX/RX switch (which is the default for the sx1262interface
 // code)
+// #define SX1262_POWER_EN SX1262_DIO3 // This forces the SX1262 code to turn on the TCXO enable
 
 #define LORA_DISABLE_SENDING // Define this to disable transmission for testing (power testing etc...)
 
@@ -162,8 +151,11 @@ work.
 
 #define PIN_GPS_WAKE (32 + 4)
 #define PIN_GPS_PPS (0 + 12)
-#define PIN_GPS_RX (0 + 6) // This is for bits going TOWARDS the GPS
-#define PIN_GPS_TX (0 + 8) // This is for bits going TOWARDS the CPU
+#define PIN_GPS_TX (0 + 6) // This is for bits going TOWARDS the GPS
+#define PIN_GPS_RX (0 + 8) // This is for bits going TOWARDS the CPU
+
+#define PIN_SERIAL1_RX PIN_GPS_RX
+#define PIN_SERIAL1_TX PIN_GPS_TX
 
 /*
  * SPI Interfaces
@@ -179,6 +171,9 @@ static const uint8_t MOSI = PIN_SPI_MOSI;
 static const uint8_t MISO = PIN_SPI_MISO;
 static const uint8_t SCK = PIN_SPI_SCK;
 
+// To debug via the segger JLINK console rather than the CDC-ACM serial device
+#define USE_SEGGER
+
 #ifdef __cplusplus
 }
 #endif