diff --git a/TODO.md b/TODO.md
index e0b633243..dd4dea45a 100644
--- a/TODO.md
+++ b/TODO.md
@@ -1,8 +1,8 @@
# High priority
-* implement regen owner and radio prefs
* have meshservice periodically send location data on mesh (if device has a GPS)
* implement getCurrentTime() - set based off gps but then updated locally
+* implement regen owner and radio prefs
* confirm second device receives that gps message and updates device db
* save our node db (and any rx packets waiting for phone) to flash - see DeviceState protobuf
@@ -14,7 +14,8 @@
# Medium priority
-* Heltec LoRa32 has 8MB flash, use a bigger partition table if needed (Auto-detected Flash size: 8MB) - check to see what the TTGO board detects as
+* Heltec LoRa32 has 8MB flash, use a bigger partition table if needed - TTGO is 4MB but has PSRAM
+* use two different env flags for ttgo vs lora32. https://docs.platformio.org/en/latest/ide/vscode.html#key-bindings
* don't send location packets if we haven't moved
* send correct hw vendor in the bluetooth info - needed so the android app can update different radio models
* use https://lastminuteengineers.com/esp32-sleep-modes-power-consumption/ association sleep pattern to save power - but see https://github.com/espressif/esp-idf/issues/2070
diff --git a/platformio.ini b/platformio.ini
index ed84abbfe..0f694ad8c 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -12,8 +12,7 @@
[env:esp32]
platform = espressif32
-board = heltec_wifi_lora_32_V2
-; board = ttgo-t-beam
+board = ttgo-t-beam
framework = arduino
; customize the partition table
@@ -60,4 +59,11 @@ lib_deps =
ESP8266_SSD1306
AXP202X_Library
SPI
- Wire ; explicitly needed here because the AXP202 library forgets to add it
\ No newline at end of file
+ Wire ; explicitly needed here because the AXP202 library forgets to add it
+
+;[env:tbeam]
+;board = ttgo-t-beam
+
+;[env:heltec]
+;build_type = debug ; to make it possible to step through our jtag debugger
+;board = heltec_wifi_lora_32_V2
\ No newline at end of file
diff --git a/src/configuration.h b/src/configuration.h
index 69f94e06e..5ac76bf51 100644
--- a/src/configuration.h
+++ b/src/configuration.h
@@ -29,7 +29,7 @@ along with this program. If not, see .
// Version
// -----------------------------------------------------------------------------
-#define APP_NAME "meshtastic-esp32"
+#define APP_NAME "meshtastic"
#define APP_VERSION "0.0.1"
// -----------------------------------------------------------------------------
@@ -46,7 +46,10 @@ along with this program. If not, see .
#endif
// If we are using the JTAG port for debugging, some pins must be left free for that (and things like GPS have to be disabled)
+// we don't support jtag on the ttgo - access to gpio 12 is a PITA
+#ifdef HELTEC_LORA32
#define USE_JTAG
+#endif
#define DEBUG_PORT Serial // Serial debug port
#define SERIAL_BAUD 115200 // Serial debug baud rate