 }
 
 WiFiManager wm;
-bool TEST_CP  = false; // always start the configportal
-bool TEST_NET = true; // do a network test, get ntp time
-char ssid[] = "*************";  //  your network SSID (name)
-char pass[] = "********";       // your network password
+
+// OPTION FLAGS
+bool TEST_CP  = true; // always start the configportal, even if ap found
+bool TEST_NET = true; // do a network test after connect, (gets ntp time)
+
+// char ssid[] = "*************";  //  your network SSID (name)
+// char pass[] = "********";       // your network password
 
 void saveWifiCallback(){
   Serial.println("[CALLBACK] saveCallback fired");

  wm.setCountry("US"); // setting wifi country seems to improve OSX soft ap connectivity, may help others as well
  
  // set channel
  wm.setWiFiAPChannel(13);
  
  // set AP hidden
  // wm.setAPHidden(true);

      print_oled("Connected\nIP: " + WiFi.localIP().toString() + "\nSSID: " + WiFi.SSID(),1);    
  }
  pinMode(TRIGGER_PIN, INPUT);

  #ifdef USEOTA
    ArduinoOTA.begin();
    ArduinoOTA.onStart([]() {
      otastarted = true;
      Serial.println("\nOTA onStart");
    });
  #endif
}

void loop() {

  #ifdef USEOTA
  ArduinoOTA.handle();
  if(otastarted)return;
  #endif
  // is configuration portal requested?
  if ( digitalRead(TRIGGER_PIN) == LOW ) {
    delay(100);
