diff --git a/Makefile b/Makefile
index 9746d31..cf17d8a 100644
--- a/Makefile
+++ b/Makefile
@@ -3,7 +3,7 @@ PROJECT_NAME := nina-fw
 EXTRA_COMPONENT_DIRS := $(PWD)/arduino
 
 ifeq ($(RELEASE),1)
-CFLAGS += -DNDEBUG -DCONFIG_FREERTOS_ASSERT_DISABLE -Os -DLOG_LOCAL_LEVEL=0
+CFLAGS += -DNDEBUG -DCONFIG_FREERTOS_ASSERT_DISABLE -Os -DLOG_LOCAL_LEVEL=ESP_LOG_DEBUG
 CPPFLAGS += -DNDEBUG -Os
 endif
 
diff --git a/main/CommandHandler.cpp b/main/CommandHandler.cpp
index 8cc0a96..2f1e4e0 100644
--- a/main/CommandHandler.cpp
+++ b/main/CommandHandler.cpp
@@ -26,7 +26,9 @@
 
 #include "CommandHandler.h"
 
-const char FIRMWARE_VERSION[6] = "1.3.1";
+#include "Arduino.h"
+
+const char FIRMWARE_VERSION[6] = "1.4.0";
 
 /*IPAddress*/uint32_t resolvedHostname;
 
@@ -1046,6 +1048,36 @@ int wpa2EntEnable(const uint8_t command[], uint8_t response[]) {
   return 6;
 }
 
+int setClientCert(const uint8_t command[], uint8_t response[]){
+
+  ets_printf("*** Called setClientCert\n");
+  size_t cert_buf_sz = command[3] << 8;
+  ets_printf("Cert Length: %d\n", cert_buf_sz);
+  ets_printf("%d", sizeof(cert_buf_sz));
+
+  char cert[cert_buf_sz];
+  memset(cert, 0x00, sizeof(cert_buf_sz));
+  memcpy(cert, &command[4], command[3]);
+
+  response[2] = 1; // number of parameters
+  response[3] = 1; // parameter 1 length
+  response[4] = 1;
+
+  return 6;
+}
+
+
+int setCertKey(const uint8_t command[], uint8_t response[]){
+
+  ets_printf("*** Called setCertKey\n");
+
+  response[2] = 1; // number of parameters
+  response[3] = 1; // parameter 1 length
+  response[4] = 1;
+
+  return 6;
+}
+
 typedef int (*CommandHandlerType)(const uint8_t command[], uint8_t response[]);
 
 const CommandHandlerType commandHandlers[] = {
@@ -1062,7 +1094,7 @@ const CommandHandlerType commandHandlers[] = {
   disconnect, NULL, getIdxRSSI, getIdxEnct, reqHostByName, getHostByName, startScanNetworks, getFwVersion, NULL, sendUDPdata, getRemoteData, getTime, getIdxBSSID, getIdxChannel, ping, getSocket,
 
   // 0x40 -> 0x4f
-  NULL, NULL, NULL, NULL, sendDataTcp, getDataBufTcp, insertDataBuf, NULL, NULL, NULL, wpa2EntSetIdentity, wpa2EntSetUsername, wpa2EntSetPassword, wpa2EntSetCACert, wpa2EntSetCertKey, wpa2EntEnable,
+  setClientCert, setCertKey, NULL, NULL, sendDataTcp, getDataBufTcp, insertDataBuf, NULL, NULL, NULL, wpa2EntSetIdentity, wpa2EntSetUsername, wpa2EntSetPassword, wpa2EntSetCACert, wpa2EntSetCertKey, wpa2EntEnable,
 
   // 0x50 -> 0x5f
   setPinMode, setDigitalWrite, setAnalogWrite,
diff --git a/sdkconfig b/sdkconfig
index c0220f9..5dbcf32 100644
--- a/sdkconfig
+++ b/sdkconfig
@@ -38,7 +38,7 @@ CONFIG_FLASH_ENCRYPTION_ENABLED=
 #
 # Serial flasher config
 #
-CONFIG_ESPTOOLPY_PORT="/dev/ttyUSB0"
+CONFIG_ESPTOOLPY_PORT=" /dev/cu.usbmodem1412201"
 CONFIG_ESPTOOLPY_BAUD_115200B=y
 CONFIG_ESPTOOLPY_BAUD_230400B=
 CONFIG_ESPTOOLPY_BAUD_921600B=