diff --git a/arch/stm32/Adafruit_LittleFS_stm32/src/littlefs/lfs.h b/arch/stm32/Adafruit_LittleFS_stm32/src/littlefs/lfs.h
index 9c3174e7d7..52f31f96ec 100644
--- a/arch/stm32/Adafruit_LittleFS_stm32/src/littlefs/lfs.h
+++ b/arch/stm32/Adafruit_LittleFS_stm32/src/littlefs/lfs.h
@@ -94,7 +94,7 @@ enum lfs_open_flags {
     LFS_F_DIRTY   = 0x10000, // File does not match storage
     LFS_F_WRITING = 0x20000, // File has been written since last flush
     LFS_F_READING = 0x40000, // File has been read since last flush
-    LFS_F_ERRED   = 0x80000, // An error occured during write
+    LFS_F_ERRED   = 0x80000, // An error occurred during write
 };
 
 // File seek flags
@@ -111,25 +111,25 @@ struct lfs_config {
     // information to the block device operations
     void *context;
 
-    // Read a region in a block. Negative error codes are propogated
+    // Read a region in a block. Negative error codes are propagated
     // to the user.
     int (*read)(const struct lfs_config *c, lfs_block_t block,
             lfs_off_t off, void *buffer, lfs_size_t size);
 
     // Program a region in a block. The block must have previously
-    // been erased. Negative error codes are propogated to the user.
+    // been erased. Negative error codes are propagated to the user.
     // May return LFS_ERR_CORRUPT if the block should be considered bad.
     int (*prog)(const struct lfs_config *c, lfs_block_t block,
             lfs_off_t off, const void *buffer, lfs_size_t size);
 
     // Erase a block. A block must be erased before being programmed.
     // The state of an erased block is undefined. Negative error codes
-    // are propogated to the user.
+    // are propagated to the user.
     // May return LFS_ERR_CORRUPT if the block should be considered bad.
     int (*erase)(const struct lfs_config *c, lfs_block_t block);
 
     // Sync the state of the underlying block device. Negative error codes
-    // are propogated to the user.
+    // are propagated to the user.
     int (*sync)(const struct lfs_config *c);
 
     // Minimum size of a block read. This determines the size of read buffers.
@@ -484,7 +484,7 @@ int lfs_dir_rewind(lfs_t *lfs, lfs_dir_t *dir);
 // Returns a negative error code on failure.
 int lfs_traverse(lfs_t *lfs, int (*cb)(void*, lfs_block_t), void *data);
 
-// Prunes any recoverable errors that may have occured in the filesystem
+// Prunes any recoverable errors that may have occurred in the filesystem
 //
 // Not needed to be called by user unless an operation is interrupted
 // but the filesystem is still mounted. This is already called on first
diff --git a/docs/companion_protocol.md b/docs/companion_protocol.md
index 9cc610ff39..acf5611832 100644
--- a/docs/companion_protocol.md
+++ b/docs/companion_protocol.md
@@ -73,7 +73,7 @@ MeshCore Companion devices expose a BLE service with the following UUIDs:
 
 5. **Send Initial Commands**
     - Send `CMD_APP_START` to identify your app to firmware and get radio settings
-    - Send `CMD_DEVICE_QEURY` to fetch device info and negotiate supported protocol versions
+    - Send `CMD_DEVICE_QUERY` to fetch device info and negotiate supported protocol versions
     - Send `CMD_SET_DEVICE_TIME` to set the firmware clock
     - Send `CMD_GET_CONTACTS` to fetch all contacts
     - Send `CMD_GET_CHANNEL` multiple times to fetch all channel slots
diff --git a/docs/faq.md b/docs/faq.md
index c04eb6aa22..e461f6d327 100644
--- a/docs/faq.md
+++ b/docs/faq.md
@@ -755,7 +755,7 @@ Allow the browser user on it:
 10. Select the device you want to update. If the device you want to update is not on the list, try enabling`OTA` on the device again
 11. If the device is not found, enable `Force Scanning` in the DFU app
 12. Tab the `Upload` to begin OTA update
-13. If it fails, try turning off and on Bluetooth on your phone.  If that doesn't work, try rebooting your phone.  If you keep getting failures at the "Enabling Bootloader" step, try forgetting the NRF board in your IOS or Andriod device's bluetooth settings and re-pair it through the DFU app.
+13. If it fails, try turning off and on Bluetooth on your phone.  If that doesn't work, try rebooting your phone.  If you keep getting failures at the "Enabling Bootloader" step, try forgetting the NRF board in your IOS or Android device's bluetooth settings and re-pair it through the DFU app.
 14. Wait for the update to complete.  It can take a few minutes.   
 15. It is strongly recommended that you install and use the OTAFIX bootloader at https://github.com/oltaco/Adafruit_nRF52_Bootloader_OTAFIX. 
 16. To update a companion node over OTA, it must be running companion firmware v1.15 or greater.   
diff --git a/docs/number_allocations.md b/docs/number_allocations.md
index c4715c5eb6..ba802442ec 100644
--- a/docs/number_allocations.md
+++ b/docs/number_allocations.md
@@ -1,6 +1,6 @@
 # Number Allocations
 
-This document lists unique numbers/identifiers used in various MeshCore protcol payloads.
+This document lists unique numbers/identifiers used in various MeshCore protocol payloads.
 
 # Group Data Types
 
diff --git a/docs/payloads.md b/docs/payloads.md
index 7745ac61ba..ac8c806f0e 100644
--- a/docs/payloads.md
+++ b/docs/payloads.md
@@ -59,7 +59,7 @@ Appdata Flags
 
 # Acknowledgement
 
-An acknowledgement that a message was received. Note that for returned path messages, an acknowledgement can be sent in the "extra" payload (see [Returned Path](#returned-path)) instead of as a separate ackowledgement packet. CLI commands do not cause acknowledgement responses, neither discrete nor extra.
+An acknowledgement that a message was received. Note that for returned path messages, an acknowledgement can be sent in the "extra" payload (see [Returned Path](#returned-path)) instead of as a separate acknowledgement packet. CLI commands do not cause acknowledgement responses, neither discrete nor extra.
 
 | Field    | Size (bytes) | Description                                                |
 |----------|--------------|------------------------------------------------------------|
@@ -141,7 +141,7 @@ Not defined in `BaseChatMesh`.
 
 Not defined in `BaseChatMesh`.
 
-### Get Neighors
+### Get Neighbors
 
 Not defined in `BaseChatMesh`.
 
diff --git a/examples/companion_radio/DataStore.cpp b/examples/companion_radio/DataStore.cpp
index c7988bb344..dda0a84ec9 100644
--- a/examples/companion_radio/DataStore.cpp
+++ b/examples/companion_radio/DataStore.cpp
@@ -541,7 +541,7 @@ bool DataStore::putBlobByKey(const uint8_t key[], int key_len, const uint8_t src
     uint32_t pos = 0, found_pos = 0;
     uint32_t min_timestamp = 0xFFFFFFFF;
 
-    // search for matching key OR evict by oldest timestmap
+    // search for matching key OR evict by oldest timestamp
     BlobRec tmp;
     file.seek(0);
     while (file.read((uint8_t *) &tmp, sizeof(tmp)) == sizeof(tmp)) {
diff --git a/examples/companion_radio/MyMesh.cpp b/examples/companion_radio/MyMesh.cpp
index 7412e75102..a4c169ea10 100644
--- a/examples/companion_radio/MyMesh.cpp
+++ b/examples/companion_radio/MyMesh.cpp
@@ -24,7 +24,7 @@
 #define CMD_REBOOT                    19
 #define CMD_GET_BATT_AND_STORAGE      20   // was CMD_GET_BATTERY_VOLTAGE
 #define CMD_SET_TUNING_PARAMS         21
-#define CMD_DEVICE_QEURY              22
+#define CMD_DEVICE_QUERY              22
 #define CMD_EXPORT_PRIVATE_KEY        23
 #define CMD_IMPORT_PRIVATE_KEY        24
 #define CMD_SEND_RAW_DATA             25
@@ -81,7 +81,7 @@
 #define RESP_CODE_NO_MORE_MESSAGES    10 // a reply to CMD_SYNC_NEXT_MESSAGE
 #define RESP_CODE_EXPORT_CONTACT      11
 #define RESP_CODE_BATT_AND_STORAGE    12 // a reply to a CMD_GET_BATT_AND_STORAGE
-#define RESP_CODE_DEVICE_INFO         13 // a reply to CMD_DEVICE_QEURY
+#define RESP_CODE_DEVICE_INFO         13 // a reply to CMD_DEVICE_QUERY
 #define RESP_CODE_PRIVATE_KEY         14 // a reply to CMD_EXPORT_PRIVATE_KEY
 #define RESP_CODE_DISABLED            15
 #define RESP_CODE_CONTACT_MSG_RECV_V3 16 // a reply to CMD_SYNC_NEXT_MESSAGE (ver >= 3)
@@ -1006,7 +1006,7 @@ void MyMesh::startInterface(BaseSerialInterface &serial) {
 }
 
 void MyMesh::handleCmdFrame(size_t len) {
-  if (cmd_frame[0] == CMD_DEVICE_QEURY && len >= 2) { // sent when app establishes connection
+  if (cmd_frame[0] == CMD_DEVICE_QUERY && len >= 2) { // sent when app establishes connection
     app_target_ver = cmd_frame[1];                    // which version of protocol does app understand
 
     int i = 0;
@@ -1112,7 +1112,7 @@ void MyMesh::handleCmdFrame(size_t len) {
     } else {
       writeErrFrame(recipient == NULL
                         ? ERR_CODE_NOT_FOUND
-                        : ERR_CODE_UNSUPPORTED_CMD); // unknown recipient, or unsuported TXT_TYPE_*
+                        : ERR_CODE_UNSUPPORTED_CMD); // unknown recipient, or unsupported TXT_TYPE_*
     }
   } else if (cmd_frame[0] == CMD_SEND_CHANNEL_TXT_MSG) { // send GroupChannel text msg
     int i = 1;
diff --git a/examples/companion_radio/ui-new/UITask.cpp b/examples/companion_radio/ui-new/UITask.cpp
index 6f363d7f96..c230b033b5 100644
--- a/examples/companion_radio/ui-new/UITask.cpp
+++ b/examples/companion_radio/ui-new/UITask.cpp
@@ -820,7 +820,7 @@ void UITask::loop() {
 #endif
 
 #ifdef AUTO_SHUTDOWN_MILLIVOLTS
-  if (millis() > next_batt_chck) {
+  if (millis() > next_batt_check) {
     uint16_t milliVolts = getBattMilliVolts();
     if (milliVolts > 0 && milliVolts < AUTO_SHUTDOWN_MILLIVOLTS) {
 
@@ -840,7 +840,7 @@ void UITask::loop() {
       shutdown();
 
     }
-    next_batt_chck = millis() + 8000;
+    next_batt_check = millis() + 8000;
   }
 #endif
 }
diff --git a/examples/companion_radio/ui-new/UITask.h b/examples/companion_radio/ui-new/UITask.h
index a77ad6e7ec..a367268bd1 100644
--- a/examples/companion_radio/ui-new/UITask.h
+++ b/examples/companion_radio/ui-new/UITask.h
@@ -36,7 +36,7 @@ class UITask : public AbstractUITask {
   char _alert[80];
   unsigned long _alert_expiry;
   int _msgcount;
-  unsigned long ui_started_at, next_batt_chck;
+  unsigned long ui_started_at, next_batt_check;
   int next_backlight_btn_check = 0;
 #ifdef PIN_STATUS_LED
   int led_state = 0;
@@ -66,7 +66,7 @@ class UITask : public AbstractUITask {
 public:
 
   UITask(mesh::MainBoard* board, BaseSerialInterface* serial) : AbstractUITask(board, serial), _display(NULL), _sensors(NULL) {
-    next_batt_chck = _next_refresh = 0;
+    next_batt_check = _next_refresh = 0;
     ui_started_at = 0;
     curr = NULL;
   }
diff --git a/examples/companion_radio/ui-tiny/UITask.cpp b/examples/companion_radio/ui-tiny/UITask.cpp
index 417024426d..511f7de509 100644
--- a/examples/companion_radio/ui-tiny/UITask.cpp
+++ b/examples/companion_radio/ui-tiny/UITask.cpp
@@ -715,19 +715,19 @@ void UITask::loop() {
 #endif
 
 #ifdef AUTO_SHUTDOWN_MILLIVOLTS
-  if (millis() > next_batt_chck) {
+  if (millis() > next_batt_check) {
     _cached_batt_mv = getBattMilliVolts();
     if (_cached_batt_mv > 0 && _cached_batt_mv < AUTO_SHUTDOWN_MILLIVOLTS) {
 
       shutdown();
 
     }
-    next_batt_chck = millis() + 8000;
+    next_batt_check = millis() + 8000;
   }
 #else
-  if (_display != NULL && _display->isOn() && millis >= next_batt_chck) {
+  if (_display != NULL && _display->isOn() && millis >= next_batt_check) {
     _cached_batt_mv = getBattMilliVolts();
-    next_batt_chck = millis() + 8000;
+    next_batt_check = millis() + 8000;
   }
 #endif
 }
diff --git a/examples/companion_radio/ui-tiny/UITask.h b/examples/companion_radio/ui-tiny/UITask.h
index 344e48b98f..ff936fed01 100644
--- a/examples/companion_radio/ui-tiny/UITask.h
+++ b/examples/companion_radio/ui-tiny/UITask.h
@@ -40,7 +40,7 @@ class UITask : public AbstractUITask {
   char _alert[80];
   unsigned long _alert_expiry;
   int _msgcount;
-  unsigned long ui_started_at, next_batt_chck;
+  unsigned long ui_started_at, next_batt_check;
   int next_backlight_btn_check = 0;
   uint16_t _cached_batt_mv;
 #ifdef PIN_STATUS_LED
@@ -72,7 +72,7 @@ class UITask : public AbstractUITask {
 public:
 
   UITask(mesh::MainBoard* board, BaseSerialInterface* serial) : AbstractUITask(board, serial), _display(NULL), _sensors(NULL) {
-    next_batt_chck = _next_refresh = 0;
+    next_batt_check = _next_refresh = 0;
     _cached_batt_mv = 0;
     ui_started_at = 0;
     curr = NULL;
diff --git a/examples/simple_repeater/MyMesh.cpp b/examples/simple_repeater/MyMesh.cpp
index 1f68c6f2a0..135fac0b5b 100644
--- a/examples/simple_repeater/MyMesh.cpp
+++ b/examples/simple_repeater/MyMesh.cpp
@@ -637,7 +637,7 @@ void MyMesh::onAdvertRecv(mesh::Packet *packet, const mesh::Identity &id, uint32
   // if this a zero hop advert (and not via 'Share'), add it to neighbours
   if (packet->path_len == 0 && !isShare(packet)) {
     AdvertDataParser parser(app_data, app_data_len);
-    if (parser.isValid() && parser.getType() == ADV_TYPE_REPEATER) { // just keep neigbouring Repeaters
+    if (parser.isValid() && parser.getType() == ADV_TYPE_REPEATER) { // just keep neighbouring Repeaters
       putNeighbour(id, timestamp, packet->getSNR());
     }
   }
diff --git a/examples/simple_room_server/MyMesh.cpp b/examples/simple_room_server/MyMesh.cpp
index 2fb80be24c..86124bd7c8 100644
--- a/examples/simple_room_server/MyMesh.cpp
+++ b/examples/simple_room_server/MyMesh.cpp
@@ -39,7 +39,7 @@ struct ServerStats {
 };
 
 void MyMesh::addPost(ClientInfo *client, const char *postData) {
-  // TODO: suggested postData format: <title>/<descrption>
+  // TODO: suggested postData format: <title>/<description>
   posts[next_post_idx].author = client->id; // add to cyclic queue
   StrHelper::strncpy(posts[next_post_idx].text, postData, MAX_POST_TEXT_LEN);
 
@@ -309,7 +309,7 @@ void MyMesh::onAnonDataRecv(mesh::Packet *packet, const uint8_t *secret, const m
                                                            // client (unknown at this stage)
     uint32_t sender_timestamp, sender_sync_since;
     memcpy(&sender_timestamp, data, 4);
-    memcpy(&sender_sync_since, &data[4], 4); // sender's "sync messags SINCE x" timestamp
+    memcpy(&sender_sync_since, &data[4], 4); // sender's "sync messages SINCE x" timestamp
 
     data[len] = 0;                                        // ensure null terminator
 
@@ -456,7 +456,7 @@ void MyMesh::onPeerDataRecv(mesh::Packet *packet, uint8_t type, int sender_idx,
           send_ack = false;
         } else {
           temp[5] = 0;      // no reply
-          send_ack = false; // and no ACK...  user shoudn't be sending these
+          send_ack = false; // and no ACK...  user shouldn't be sending these
         }
       } else { // TXT_TYPE_PLAIN
         if ((client->permissions & PERM_ACL_ROLE_MASK) == PERM_ACL_GUEST) {
@@ -978,7 +978,7 @@ void MyMesh::loop() {
     if (did_push) {
       next_push = futureMillis(SYNC_PUSH_INTERVAL);
     } else {
-      // were no unsynced posts for curr client, so proccess next client much quicker! (in next loop())
+      // were no unsynced posts for curr client, so process next client much quicker! (in next loop())
       next_push = futureMillis(SYNC_PUSH_INTERVAL / 8);
     }
   }
diff --git a/examples/simple_sensor/SensorMesh.cpp b/examples/simple_sensor/SensorMesh.cpp
index 879fcbf026..0cd47bb950 100644
--- a/examples/simple_sensor/SensorMesh.cpp
+++ b/examples/simple_sensor/SensorMesh.cpp
@@ -78,7 +78,7 @@ static uint8_t getDataSize(uint8_t type) {
       case LPP_GPS:
         return 9;
       case LPP_POLYLINE:
-        return 8;  // TODO: this is MINIMIUM
+        return 8;  // TODO: this is MINIMUM
       case LPP_GYROMETER:
       case LPP_ACCELEROMETER:
         return 6;
diff --git a/src/Identity.cpp b/src/Identity.cpp
index ea546274da..055a0ac38e 100644
--- a/src/Identity.cpp
+++ b/src/Identity.cpp
@@ -75,7 +75,7 @@ bool LocalIdentity::validatePrivateKey(const uint8_t prv[64]) {
 
     uint8_t ss1[32], ss2[32];
 
-    // shared secret we calculte from test client pubkey and given private key
+    // shared secret we calculate from test client pubkey and given private key
     ed25519_key_exchange(ss1, test_client_pub, prv);
 
     // shared secret they calculate from our derived public key and test client private key
diff --git a/src/Identity.h b/src/Identity.h
index 008f7b5bf6..779385b94c 100644
--- a/src/Identity.h
+++ b/src/Identity.h
@@ -67,14 +67,14 @@ class LocalIdentity : public Identity {
   void sign(uint8_t* sig, const uint8_t* message, int msg_len) const;
 
   /**
-   * \brief  the ECDH key exhange, with Ed25519 public key transposed to Ex25519.
+   * \brief  the ECDH key exchange, with Ed25519 public key transposed to Ex25519.
    * \param  secret OUT - the 'shared secret' (must be PUB_KEY_SIZE bytes)
    * \param  other IN - the second party in the exchange.
   */
   void calcSharedSecret(uint8_t* secret, const Identity& other) const { calcSharedSecret(secret, other.pub_key); }
 
   /**
-   * \brief  the ECDH key exhange, with Ed25519 public key transposed to Ex25519.
+   * \brief  the ECDH key exchange, with Ed25519 public key transposed to Ex25519.
    * \param  secret OUT - the 'shared secret' (must be PUB_KEY_SIZE bytes)
    * \param  other_pub_key IN - the public key of second party in the exchange (must be PUB_KEY_SIZE bytes)
   */
diff --git a/src/Mesh.cpp b/src/Mesh.cpp
index 7252974a92..6e986d3f0d 100644
--- a/src/Mesh.cpp
+++ b/src/Mesh.cpp
@@ -637,7 +637,7 @@ void Mesh::sendFlood(Packet* packet, uint32_t delay_millis, uint8_t path_hash_si
   if (packet->getPayloadType() == PAYLOAD_TYPE_PATH) {
     pri = 2;
   } else if (packet->getPayloadType() == PAYLOAD_TYPE_ADVERT) {
-    pri = 3;   // de-prioritie these
+    pri = 3;   // de-prioritize these
   } else {
     pri = 1;
   }
@@ -666,7 +666,7 @@ void Mesh::sendFlood(Packet* packet, uint16_t* transport_codes, uint32_t delay_m
   if (packet->getPayloadType() == PAYLOAD_TYPE_PATH) {
     pri = 2;
   } else if (packet->getPayloadType() == PAYLOAD_TYPE_ADVERT) {
-    pri = 3;   // de-prioritie these
+    pri = 3;   // de-prioritize these
   } else {
     pri = 1;
   }
diff --git a/src/Mesh.h b/src/Mesh.h
index d53d6d25fa..560a7952af 100644
--- a/src/Mesh.h
+++ b/src/Mesh.h
@@ -107,7 +107,7 @@ class Mesh : public Dispatcher {
 
   /**
    * \brief  A path TO peer (sender_idx) has been received. (also with optional 'extra' data encoded)
-   *         NOTE: these can be received multiple times (per sender), via differen routes
+   *         NOTE: these can be received multiple times (per sender), via different routes
    * \param  sender_idx  index of peer, [0..n) where n is what searchPeersByHash() returned
    * \param  secret   the pre-calculated shared-secret (handy for sending response packet)
    * \returns   true, if path was accepted and that reciprocal path should be sent
@@ -130,7 +130,7 @@ class Mesh : public Dispatcher {
 
   /**
    * \brief  A path TO 'sender' has been received. (also with optional 'extra' data encoded)
-   *         NOTE: these can be received multiple times (per sender), via differen routes
+   *         NOTE: these can be received multiple times (per sender), via different routes
   */
   virtual void onPathRecv(Packet* packet, Identity& sender, uint8_t* path, uint8_t path_len, uint8_t extra_type, uint8_t* extra, uint8_t extra_len) { }
 
@@ -212,12 +212,12 @@ class Mesh : public Dispatcher {
   void sendDirect(Packet* packet, const uint8_t* path, uint8_t path_len, uint32_t delay_millis=0);
 
   /**
-   * \brief  send a locally-generated Packet to just neigbor nodes (zero hops)
+   * \brief  send a locally-generated Packet to just neighbor nodes (zero hops)
   */
   void sendZeroHop(Packet* packet, uint32_t delay_millis=0);
 
   /**
-   * \brief  send a locally-generated Packet to just neigbor nodes (zero hops), with specific transort codes
+   * \brief  send a locally-generated Packet to just neighbor nodes (zero hops), with specific transort codes
    * \param transport_codes   array of 2 codes to attach to packet
   */
   void sendZeroHop(Packet* packet, uint16_t* transport_codes, uint32_t delay_millis=0);
diff --git a/src/Utils.cpp b/src/Utils.cpp
index 186c8720a2..4726d4701d 100644
--- a/src/Utils.cpp
+++ b/src/Utils.cpp
@@ -139,7 +139,7 @@ int Utils::parseTextParts(char* text, const char* parts[], int max_num, char sep
     parts[num++] = sp;
     while (*sp && *sp != separator) sp++;
     if (*sp) {
-       *sp++ = 0;  // replace the seperator with a null, and skip past it
+       *sp++ = 0;  // replace the separator with a null, and skip past it
     }
   }
   // if we hit the maximum parts, make sure LAST entry does NOT have separator 
diff --git a/src/helpers/StaticPoolPacketManager.cpp b/src/helpers/StaticPoolPacketManager.cpp
index b8926df0cc..7db7a454de 100644
--- a/src/helpers/StaticPoolPacketManager.cpp
+++ b/src/helpers/StaticPoolPacketManager.cpp
@@ -69,7 +69,7 @@ bool PacketQueue::add(mesh::Packet* packet, uint8_t priority, uint32_t scheduled
 }
 
 StaticPoolPacketManager::StaticPoolPacketManager(int pool_size): unused(pool_size), send_queue(pool_size), rx_queue(pool_size) {
-  // load up our unusued Packet pool
+  // load up our unused Packet pool
   for (int i = 0; i < pool_size; i++) {
     unused.add(new mesh::Packet(), 0, 0);
   }
diff --git a/src/helpers/esp32/TBeamBoard.cpp b/src/helpers/esp32/TBeamBoard.cpp
index 5f708d71d9..d11463a867 100644
--- a/src/helpers/esp32/TBeamBoard.cpp
+++ b/src/helpers/esp32/TBeamBoard.cpp
@@ -86,7 +86,7 @@ void TBeamBoard::scanDevices(TwoWire *w)
             }
 
         } else if (err == 4) {
-            Serial.print("Unknow error at address 0x");
+            Serial.print("Unknown error at address 0x");
             if (addr < 16) {
                 Serial.print("0");
             }
@@ -176,7 +176,7 @@ bool TBeamBoard::power_init()
     PMU->setProtectedChannel(XPOWERS_DCDC1);          //Protect the OLED power rail
     PMU->setProtectedChannel(XPOWERS_DCDC3);          //Protect the ESP32 power rail
 
-    PMU->disablePowerOutput(XPOWERS_DCDC2);           //Disable unsused power rail DC2
+    PMU->disablePowerOutput(XPOWERS_DCDC2);           //Disable unused power rail DC2
 
     PMU->disableIRQ(XPOWERS_AXP192_ALL_IRQ);          //Disable PMU IRQ
 
diff --git a/src/helpers/sensors/EnvironmentSensorManager.cpp b/src/helpers/sensors/EnvironmentSensorManager.cpp
index b5e23b3fe8..97c68b691c 100644
--- a/src/helpers/sensors/EnvironmentSensorManager.cpp
+++ b/src/helpers/sensors/EnvironmentSensorManager.cpp
@@ -675,7 +675,7 @@ void EnvironmentSensorManager::initBasicGPS() {
 
   if (gps_detected) {
     MESH_DEBUG_PRINTLN("GPS detected");
-    #ifdef PERSISTANT_GPS
+    #ifdef PERSISTENT_GPS
       gps_active = true;
       return;
     #endif
@@ -686,7 +686,7 @@ void EnvironmentSensorManager::initBasicGPS() {
   gps_active = false; //Set GPS visibility off until setting is changed
 }
 
-// gps code for rak might be moved to MicroNMEALoactionProvider
+// gps code for rak might be moved to MicroNMEALocationProvider
 // or make a new location provider ...
 #ifdef RAK_WISBLOCK_GPS
 void EnvironmentSensorManager::rakGPSInit(){
@@ -714,7 +714,7 @@ void EnvironmentSensorManager::rakGPSInit(){
     return;
   }
 
-  #ifndef FORCE_GPS_ALIVE // for use with repeaters, until GPS toggle is implimented
+  #ifndef FORCE_GPS_ALIVE // for use with repeaters, until GPS toggle is implemented
   //Now that GPS is found and set up, set to sleep for initial state
   stop_gps();
   #endif
diff --git a/src/helpers/sensors/LPPDataHelpers.h b/src/helpers/sensors/LPPDataHelpers.h
index 37b50f3f12..0991111949 100644
--- a/src/helpers/sensors/LPPDataHelpers.h
+++ b/src/helpers/sensors/LPPDataHelpers.h
@@ -61,7 +61,7 @@
 
 #define LPP_ERROR_OK 0
 #define LPP_ERROR_OVERFLOW 1
-#define LPP_ERROR_UNKOWN_TYPE 2
+#define LPP_ERROR_UNKNOWN_TYPE 2
 
 class LPPReader {
   const uint8_t* _buf;
@@ -142,7 +142,7 @@ class LPPReader {
       case LPP_GPS:
         _pos += 9; break;
       case LPP_POLYLINE:
-        _pos += 8; break;  // TODO: this is MINIMIUM
+        _pos += 8; break;  // TODO: this is MINIMUM
       case LPP_GYROMETER:
       case LPP_ACCELEROMETER:
         _pos += 6; break;
diff --git a/src/helpers/sensors/MicroNMEALocationProvider.h b/src/helpers/sensors/MicroNMEALocationProvider.h
index eec466d3aa..d4e9a0c853 100644
--- a/src/helpers/sensors/MicroNMEALocationProvider.h
+++ b/src/helpers/sensors/MicroNMEALocationProvider.h
@@ -48,8 +48,8 @@ class MicroNMEALocationProvider : public LocationProvider {
     static const unsigned long TIME_SYNC_INTERVAL = 1800000; // Re-sync every 30 minutes
 
 public :
-    MicroNMEALocationProvider(Stream& ser, mesh::RTCClock* clock = NULL, int pin_reset = GPS_RESET, int pin_en = GPS_EN,RefCountedDigitalPin* peripher_power=NULL) :
-    _gps_serial(&ser), nmea(_nmeaBuffer, sizeof(_nmeaBuffer)), _pin_reset(pin_reset), _pin_en(pin_en), _clock(clock), _peripher_power(peripher_power) {
+    MicroNMEALocationProvider(Stream& serial, mesh::RTCClock* clock = NULL, int pin_reset = GPS_RESET, int pin_en = GPS_EN,RefCountedDigitalPin* peripher_power=NULL) :
+    _gps_serial(&serial), nmea(_nmeaBuffer, sizeof(_nmeaBuffer)), _pin_reset(pin_reset), _pin_en(pin_en), _clock(clock), _peripher_power(peripher_power) {
         if (_pin_reset != -1) {
             pinMode(_pin_reset, OUTPUT);
             digitalWrite(_pin_reset, GPS_RESET_FORCE);
diff --git a/src/helpers/sensors/RAK12035_SoilMoisture.cpp b/src/helpers/sensors/RAK12035_SoilMoisture.cpp
index cc3aed5512..531c3cdd84 100644
--- a/src/helpers/sensors/RAK12035_SoilMoisture.cpp
+++ b/src/helpers/sensors/RAK12035_SoilMoisture.cpp
@@ -118,14 +118,14 @@ bool RAK12035_SoilMoisture::begin(uint8_t addr)
  *  4) Click refresh several times.  This will take a capacitance reading and if it is
  *     greater than the current Dry value it will store it in the sensor
  *     The value will bounce a little as you click refresh, but it eventually settles down (a few clicks)
- *     the stored value will stabalize at it's Maximum value.
+ *     the stored value will stabilize at it's Maximum value.
  * 
  * 5) Put the sensor in water.  
  * 
  * 6) Click refresh several times.  This will take a capacitance reading and if it is
  *     less than the current Wet value it will store it in the sensor
  *     The value will bounce a little as you click refresh, but it eventually settles down (a few clicks)
- *     the stored value will stabalize at it's Minimum value.
+ *     the stored value will stabilize at it's Minimum value.
  * 
  * 7) The Sensor is now calibrated, turn off the device.
  * 
@@ -242,7 +242,7 @@ bool RAK12035_SoilMoisture::sensor_sleep()                          //Command 06
 // Optional: turn off sensor power AFTER successful sleep command
 
 // This has been commented out due to a pin name conflict with the Heltec v3
-// This will need to be resolved if this funstion is to be utilized in the future
+// This will need to be resolved if this function is to be utilized in the future
 /*
     digitalWrite(WB_IO2, LOW);
 */
@@ -417,7 +417,7 @@ bool RAK12035_SoilMoisture::sensor_on()
 {
     uint8_t data;
  // This has been commented out due to a pin name conflict with the Heltec v3
- // This will need to be resolved if this funstion is to be utilized in the future
+ // This will need to be resolved if this function is to be utilized in the future
 
 /*
     pinMode(WB_IO2, OUTPUT);
@@ -460,7 +460,7 @@ bool RAK12035_SoilMoisture::reset()
 //  But might be needed if power is ever switched off.  Here is tested code.
 
 // This has been commented out due to a pin name conflict with the Heltec v3
-// This will need to be resolved if this funstion is to be utilized in the future
+// This will need to be resolved if this function is to be utilized in the future
 
 /*
     pinMode(WB_IO4, OUTPUT);        //Set IO4 Pin to Output (connected to *reset on sensor)
diff --git a/src/helpers/stm32/InternalFileSystem.cpp b/src/helpers/stm32/InternalFileSystem.cpp
index dc032eb968..6a7d7064ed 100644
--- a/src/helpers/stm32/InternalFileSystem.cpp
+++ b/src/helpers/stm32/InternalFileSystem.cpp
@@ -37,7 +37,7 @@ static int _internal_flash_read(const struct lfs_config *c, lfs_block_t block, l
 }    
 
 // Program a region in a block. The block must have previously
-// been erased. Negative error codes are propogated to the user.
+// been erased. Negative error codes are propagated to the user.
 // May return LFS_ERR_CORRUPT if the block should be considered bad.
 static int _internal_flash_prog(const struct lfs_config *c, lfs_block_t block, lfs_off_t off, const void *buffer, lfs_size_t size)
 {    
@@ -62,7 +62,7 @@ static int _internal_flash_prog(const struct lfs_config *c, lfs_block_t block, l
 
 // Erase a block. A block must be erased before being programmed.
 // The state of an erased block is undefined. Negative error codes
-// are propogated to the user.
+// are propagated to the user.
 // May return LFS_ERR_CORRUPT if the block should be considered bad.
 static int _internal_flash_erase(const struct lfs_config *c, lfs_block_t block)
 {   
@@ -87,7 +87,7 @@ static int _internal_flash_erase(const struct lfs_config *c, lfs_block_t block)
 }   
 
 // Sync the state of the underlying block device. Negative error codes
-// are propogated to the user.
+// are propagated to the user.
 static int _internal_flash_sync(const struct lfs_config *c)
 {    
     return LFS_ERR_OK; // don't need sync
diff --git a/src/helpers/ui/OLEDDisplay.cpp b/src/helpers/ui/OLEDDisplay.cpp
index 1910134400..c4978c00ff 100644
--- a/src/helpers/ui/OLEDDisplay.cpp
+++ b/src/helpers/ui/OLEDDisplay.cpp
@@ -1166,7 +1166,7 @@ char DefaultFontTableLookup(const uint8_t ch) {
 	uint8_t last = LASTCHAR;   // get last char
 	LASTCHAR = ch;
 
-	switch (last) {    // conversion depnding on first UTF8-character
+	switch (last) {    // conversion depending on first UTF8-character
 		case 0xC2: return (uint8_t) ch;
 		case 0xC3: return (uint8_t) (ch | 0xC0);
 		case 0x82: if (ch == 0xAC) return (uint8_t) 0x80;    // special case Euro-symbol
diff --git a/src/helpers/ui/OLEDDisplay.h b/src/helpers/ui/OLEDDisplay.h
index 22ea744db0..08698e3288 100644
--- a/src/helpers/ui/OLEDDisplay.h
+++ b/src/helpers/ui/OLEDDisplay.h
@@ -262,7 +262,7 @@ class OLEDDisplay : public Stream {
     // font settings
     uint16_t getStringWidth(const char* text, uint16_t length, bool utf8 = false);
 
-    // Convencience method for the const char version
+    // Convenience method for the const char version
     uint16_t getStringWidth(const String &text);
 
     // Specifies relative to which anchor point
@@ -317,7 +317,7 @@ class OLEDDisplay : public Stream {
     // Log buffer implementation
 
     // This will define the lines and characters you can
-    // print to the screen. When you exeed the buffer size (lines * chars)
+    // print to the screen. When you exceed the buffer size (lines * chars)
     // the output may be truncated due to the size constraint.
     bool setLogBuffer(uint16_t lines, uint16_t chars);
 
diff --git a/src/helpers/ui/ST7789Spi.h b/src/helpers/ui/ST7789Spi.h
index 09af6457df..3a961e2388 100644
--- a/src/helpers/ui/ST7789Spi.h
+++ b/src/helpers/ui/ST7789Spi.h
@@ -179,8 +179,8 @@ class ST7789Spi : public OLEDDisplay {
        }
 
        // If the minBoundY wasn't updated
-       // we can savely assume that buffer_back[pos] == buffer[pos]
-       // holdes true for all values of pos
+       // we can safely assume that buffer_back[pos] == buffer[pos]
+       // holds true for all values of pos
        if (minBoundY == UINT16_MAX) return;
 
 		  set_CS(LOW);
diff --git a/src/helpers/ui/buzzer.h b/src/helpers/ui/buzzer.h
index 0a50055282..53edda857a 100644
--- a/src/helpers/ui/buzzer.h
+++ b/src/helpers/ui/buzzer.h
@@ -5,7 +5,7 @@
 
 /* class abstracts underlying RTTTL library 
 
-    Just a simple imlementation to start.  At the moment use same
+    Just a simple implementation to start.  At the moment use same
     melody for message and discovery
     Suggest enum type for different sounds
     - on message
diff --git a/variants/generic-e22/variant.h b/variants/generic-e22/variant.h
index 6c850af262..d14b766dee 100644
--- a/variants/generic-e22/variant.h
+++ b/variants/generic-e22/variant.h
@@ -32,7 +32,7 @@
 
 // The E22's TXEN pin is connected to MCU pin, E22's RXEN pin is connected to MCU pin (allows for ramping up PA before transmission
 // Don't define DIO2_AS_RF_SWITCH because we only use DIO2 or an MCU pin mutually exclusively to connect to E22's TXEN (to prevent
-// a short if they are both connected at the same time and there's a slight non-neglibible delay and/or voltage difference between
+// a short if they are both connected at the same time and there's a slight non-negligible delay and/or voltage difference between
 // DIO2 and TXEN).
 #define SX126X_TXEN 13 // Schematic connects EBYTE module's TXEN pin to MCU
 #define SX126X_RXEN 14 // Schematic connects EBYTE module's RXEN pin to MCU
diff --git a/variants/ikoka_handheld_nrf/IkokaNrf52Board.cpp b/variants/ikoka_handheld_nrf/IkokaNrf52Board.cpp
index f1d9f17d3a..155dfd1f41 100644
--- a/variants/ikoka_handheld_nrf/IkokaNrf52Board.cpp
+++ b/variants/ikoka_handheld_nrf/IkokaNrf52Board.cpp
@@ -20,7 +20,7 @@ void IkokaNrf52Board::begin() {
   pinMode(VBAT_ENABLE, OUTPUT);
   digitalWrite(VBAT_ENABLE, HIGH);
 
-  // required button pullup is handled as part of button initilization
+  // required button pullup is handled as part of button initialization
   // in target.cpp
 
 #if defined(PIN_WIRE_SDA) && defined(PIN_WIRE_SCL)
diff --git a/variants/lilygo_tbeam_1w/platformio.ini b/variants/lilygo_tbeam_1w/platformio.ini
index c7a595520e..65851a2b6f 100644
--- a/variants/lilygo_tbeam_1w/platformio.ini
+++ b/variants/lilygo_tbeam_1w/platformio.ini
@@ -74,7 +74,7 @@ build_flags =
   -D ADVERT_LON=0.0
   -D ADMIN_PASSWORD='"password"'
   -D MAX_NEIGHBOURS=50
-  -D PERSISTANT_GPS=1
+  -D PERSISTENT_GPS=1
   -D ENV_SKIP_GPS_DETECT=1
 ;  -D MESH_PACKET_LOGGING=1
 ;  -D MESH_DEBUG=1
@@ -94,7 +94,7 @@ build_flags =
   -D ADVERT_LON=0.0
   -D ADMIN_PASSWORD='"password"'
   -D ROOM_PASSWORD='"hello"'
-  -D PERSISTANT_GPS=1
+  -D PERSISTENT_GPS=1
   -D ENV_SKIP_GPS_DETECT=1
 ;  -D MESH_PACKET_LOGGING=1
 ;  -D MESH_DEBUG=1
@@ -112,7 +112,7 @@ build_flags =
   -I examples/companion_radio/ui-new
   -D MAX_CONTACTS=350
   -D MAX_GROUP_CHANNELS=40
-  -D PERSISTANT_GPS=1
+  -D PERSISTENT_GPS=1
   -D ENV_SKIP_GPS_DETECT=1
 ;  -D MESH_PACKET_LOGGING=1
 ;  -D MESH_DEBUG=1
@@ -133,7 +133,7 @@ build_flags =
   -D MAX_GROUP_CHANNELS=40
   -D BLE_PIN_CODE=123456
   -D OFFLINE_QUEUE_SIZE=256
-  -D PERSISTANT_GPS=1
+  -D PERSISTENT_GPS=1
   -D ENV_SKIP_GPS_DETECT=1
 ;  -D BLE_DEBUG_LOGGING=1
 ;  -D MESH_PACKET_LOGGING=1
@@ -158,7 +158,7 @@ build_flags =
   -D WIFI_DEBUG_LOGGING=1
   -D WIFI_SSID='"myssid"'
   -D WIFI_PWD='"mypwd"'
-  -D PERSISTANT_GPS=1
+  -D PERSISTENT_GPS=1
   -D ENV_SKIP_GPS_DETECT=1
 ;  -D MESH_PACKET_LOGGING=1
 ;  -D MESH_DEBUG=1
@@ -181,7 +181,7 @@ build_flags =
   -D ADMIN_PASSWORD='"password"'
   -D MAX_NEIGHBOURS=50
   -D WITH_ESPNOW_BRIDGE=1
-  -D PERSISTANT_GPS=1
+  -D PERSISTENT_GPS=1
   -D ENV_SKIP_GPS_DETECT=1
 ;  -D BRIDGE_DEBUG=1
 ;  -D MESH_PACKET_LOGGING=1
diff --git a/variants/lilygo_tbeam_SX1276/platformio.ini b/variants/lilygo_tbeam_SX1276/platformio.ini
index f157623227..f3ad5570f0 100644
--- a/variants/lilygo_tbeam_SX1276/platformio.ini
+++ b/variants/lilygo_tbeam_SX1276/platformio.ini
@@ -63,7 +63,7 @@ build_flags =
   -D ADVERT_LON=0.0
   -D ADMIN_PASSWORD='"password"'
   -D MAX_NEIGHBOURS=50
-  -D PERSISTANT_GPS=1
+  -D PERSISTENT_GPS=1
 ;  -D MESH_PACKET_LOGGING=1
 ;  -D MESH_DEBUG=1
 build_src_filter = ${LilyGo_TBeam_SX1276.build_src_filter}
@@ -81,7 +81,7 @@ lib_deps =
 ;   -D ADVERT_LON=0.0
 ;   -D ADMIN_PASSWORD='"password"'
 ;   -D MAX_NEIGHBOURS=50
-;   -D PERSISTANT_GPS=1
+;   -D PERSISTENT_GPS=1
 ;   -D WITH_RS232_BRIDGE=Serial2
 ;   -D WITH_RS232_BRIDGE_RX=5
 ;   -D WITH_RS232_BRIDGE_TX=6
@@ -104,7 +104,7 @@ build_flags =
   -D ADVERT_LON=0.0
   -D ADMIN_PASSWORD='"password"'
   -D MAX_NEIGHBOURS=50
-  -D PERSISTANT_GPS=1
+  -D PERSISTENT_GPS=1
   -D WITH_ESPNOW_BRIDGE=1
 ;  -D BRIDGE_DEBUG=1
 ;  -D MESH_PACKET_LOGGING=1
diff --git a/variants/meshadventurer/variant.h b/variants/meshadventurer/variant.h
index 356a3e172f..32ea772aee 100644
--- a/variants/meshadventurer/variant.h
+++ b/variants/meshadventurer/variant.h
@@ -32,7 +32,7 @@
 
 // The E22's TXEN pin is connected to MCU pin, E22's RXEN pin is connected to MCU pin (allows for ramping up PA before transmission
 // Don't define DIO2_AS_RF_SWITCH because we only use DIO2 or an MCU pin mutually exclusively to connect to E22's TXEN (to prevent
-// a short if they are both connected at the same time and there's a slight non-neglibible delay and/or voltage difference between
+// a short if they are both connected at the same time and there's a slight non-negligible delay and/or voltage difference between
 // DIO2 and TXEN).
 #define SX126X_TXEN 13 // Schematic connects EBYTE module's TXEN pin to MCU
 #define SX126X_RXEN 14 // Schematic connects EBYTE module's RXEN pin to MCU
diff --git a/variants/nano_g2_ultra/variant.h b/variants/nano_g2_ultra/variant.h
index b8a53fcfb5..14557c5111 100644
--- a/variants/nano_g2_ultra/variant.h
+++ b/variants/nano_g2_ultra/variant.h
@@ -118,7 +118,7 @@ External serial flash W25Q16JV_IQ
 // This is used as an *output* from the sx1262 and connected internally to power the tcxo, do not drive from the main CPU?
 #define SX126X_BUSY (32 + 11)
 #define SX126X_RESET (32 + 15)
-//  DIO2 controlls an antenna switch and the TCXO voltage is controlled by DIO3
+//  DIO2 controls an antenna switch and the TCXO voltage is controlled by DIO3
 #define SX126X_DIO2_AS_RF_SWITCH
 #define SX126X_DIO3_TCXO_VOLTAGE 1.8
 
diff --git a/variants/rak3401/variant.h b/variants/rak3401/variant.h
index 9882788608..8f9b467366 100644
--- a/variants/rak3401/variant.h
+++ b/variants/rak3401/variant.h
@@ -181,7 +181,7 @@ static const uint8_t AREF = PIN_AREF;
 #define WB_IO2 PIN_3V3_EN
 
 // RAK1910 GPS module
-// If using the wisblock GPS module and pluged into Port A on WisBlock base
+// If using the wisblock GPS module and plugged into Port A on WisBlock base
 // IO1 is hooked to PPS (pin 12 on header) = gpio 17
 // IO2 is hooked to GPS RESET = gpio 34, but it can not be used to this because IO2 is ALSO used to control 3V3_S power (1 is on).
 // Therefore must be 1 to keep peripherals powered
diff --git a/variants/thinknode_m5/platformio.ini b/variants/thinknode_m5/platformio.ini
index 8572d1ebe0..e1642a9681 100644
--- a/variants/thinknode_m5/platformio.ini
+++ b/variants/thinknode_m5/platformio.ini
@@ -39,7 +39,7 @@ build_flags = ${esp32_base.build_flags}
   -D SX126X_RX_BOOSTED_GAIN=1
   -D MESH_DEBUG=1
   -D ENV_INCLUDE_GPS=1
-  -D PERSISTANT_GPS=1
+  -D PERSISTENT_GPS=1
   -D ENV_SKIP_GPS_DETECT=1
 build_src_filter = ${esp32_base.build_src_filter}
   +<helpers/sensors/EnvironmentSensorManager.cpp>
diff --git a/variants/thinknode_m6/platformio.ini b/variants/thinknode_m6/platformio.ini
index 6fe9043668..8bead803b3 100644
--- a/variants/thinknode_m6/platformio.ini
+++ b/variants/thinknode_m6/platformio.ini
@@ -25,7 +25,7 @@ build_flags = ${nrf52_base.build_flags}
   -D SX126X_RX_BOOSTED_GAIN=1
   -D LORA_TX_POWER=22
   -D P_LORA_TX_LED=PIN_LED_BLUE
-;  -D PERSISTANT_GPS=1
+;  -D PERSISTENT_GPS=1
 ;  -D ENV_SKIP_GPS_DETECT=1
 build_src_filter = ${nrf52_base.build_src_filter}
   +<helpers/*.cpp>