diff --git a/docs/info_pairing.md b/docs/info_pairing.md
index 114ac54..bff5f15 100644
--- a/docs/info_pairing.md
+++ b/docs/info_pairing.md
@@ -22,7 +22,7 @@
 )
 ```
 
-- QolsysController starts a KeyExchangeServer (TLS Socket) listenning on `plugin_ip`:`plugin_pairing_port`
+- QolsysController starts a KeyExchangeServer (TLS Socket) listening on `plugin_ip`:`plugin_pairing_port`
 
 On Panel, go to IQ Remote pairing config page:
 
diff --git a/docs/info_qolsys_controller.md b/docs/info_qolsys_controller.md
index 0a74531..79ab014 100644
--- a/docs/info_qolsys_controller.md
+++ b/docs/info_qolsys_controller.md
@@ -73,16 +73,16 @@ Log all MQTT traffic between the IQ Panel and qolsys-controller.
 Enable the internal MQTT bridge.
 
 ### `mqtt_bridge_hostname`
-MQTT Bridge Hostname (if connectif to external Brooker)
+MQTT Bridge Hostname (if connecting to external Broker)
 
 ### `mqtt_bridge_client_username`
-MQTT Bridge Client Username (if connectif to external Brooker)
+MQTT Bridge Client Username (if connecting to external Broker)
 
 ### `mqtt_bridge_client_password`
-MQTT Bridge Client Password (if connectif to external Brooker)
+MQTT Bridge Client Password (if connecting to external Broker)
 
 ### `mqtt_bridge_broker_enabled`
-Enable the internal MQTT bridge Brooker
+Enable the internal MQTT bridge Broker
 
 ### `mqtt_bridge_broker_allowed_users`: 
 Dictionary of allowed users for MQTT authentication. External clients will not be able to authenticate unless explicitly configured.
diff --git a/qolsys_controller/mqtt_bridge/broker.py b/qolsys_controller/mqtt_bridge/broker.py
index 7ebc5fa..23edf80 100644
--- a/qolsys_controller/mqtt_bridge/broker.py
+++ b/qolsys_controller/mqtt_bridge/broker.py
@@ -61,7 +61,7 @@ async def run_bridge_broker(self, startup_event: asyncio.Event, startup_result:
             await self._broker.start()
 
             LOGGER.info(
-                "MQTT Bridge Broker - Listenning on %s:%s",
+                "MQTT Bridge Broker - Listening on %s:%s",
                 self._controller.settings.plugin_ip,
                 self._controller.settings.mqtt_bridge_port,
             )
diff --git a/qolsys_controller/pki.py b/qolsys_controller/pki.py
index 1c5d68d..c171613 100644
--- a/qolsys_controller/pki.py
+++ b/qolsys_controller/pki.py
@@ -198,9 +198,9 @@ def mqtt_bridge_key_file_path(self) -> Path:
         return self._settings.mqtt_bridge_directory.joinpath(self._settings._mqtt_bridge_keyfile)
 
     async def create_mqtt_bridge_certificates(self) -> bool:
-        # Check for MQTT Bridge Broker certificate and key file colision
+        # Check for MQTT Bridge Broker certificate and key file collision
         if await self.check_mqtt_bridge_cer_file() or await self.check_mqtt_bridge_key_file():
-            LOGGER.error("MQTT Bridge Broker: Certificate or Key File Colision")
+            LOGGER.error("MQTT Bridge Broker: Certificate or Key File Collision")
             return False
 
         LOGGER.debug("MQTT Bridge Broker: Creating KEY")
@@ -264,24 +264,24 @@ async def create(self, mac: str, key_size: int) -> bool:
             LOGGER.error("Create Directory Collision")
             return False
 
-        # Check for private key colision
+        # Check for private key collision
         if await self.check_key_file():
-            LOGGER.error("Create KEY File Colision")
+            LOGGER.error("Create KEY File Collision")
             return False
 
-        # Check for CER file colision
+        # Check for CER file collision
         if await self.check_cer_file():
-            LOGGER.error("Create CER File Colision")
+            LOGGER.error("Create CER File Collision")
             return False
 
-        # Check for CSR file colision
+        # Check for CSR file collision
         if await self.check_csr_file():
-            LOGGER.error("Create CSR File Colision")
+            LOGGER.error("Create CSR File Collision")
             return False
 
-        # Check for CER file colision
+        # Check for CER file collision
         if await self.check_cer_file():
-            LOGGER.error("Create Signed Certificate File Colision")
+            LOGGER.error("Create Signed Certificate File Collision")
             return False
 
         LOGGER.debug("Creating PKI: %s", self.formatted_id())
diff --git a/qolsys_controller/settings.py b/qolsys_controller/settings.py
index 118321d..dabda9a 100644
--- a/qolsys_controller/settings.py
+++ b/qolsys_controller/settings.py
@@ -60,7 +60,7 @@ def __init__(self, controller: QolsysController) -> None:
         self._mqtt_bridge_client_username: str = ""
         self._mqtt_bridge_client_password: str = ""
 
-        # MQTT BRIDGE BROOKER
+        # MQTT BRIDGE BROKER
         self._mqtt_bridge_broker_enabled: bool = False
         self._mqtt_bridge_broker_allowed_users: dict[str, str] = {}
         self._mqtt_bridge_max_connections: int = 5