diff --git a/lib/addons.sh b/lib/addons.sh
index 52f6885..a07c1fe 100644
--- a/lib/addons.sh
+++ b/lib/addons.sh
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 # ==============================================================================
 # Home Assistant Community Add-ons: Bashio
-# Bashio is an bash function library for use with Home Assistant add-ons.
+# Bashio is a bash function library for use with Home Assistant add-ons.
 #
 # It contains a set of commonly used operations and can be used
 # to be included in add-on scripts to reduce code duplication across add-ons.
@@ -311,7 +311,7 @@ function bashio::addon.url() {
 }
 
 # ------------------------------------------------------------------------------
-# Returns the deatched state of an add-on.
+# Returns the detached state of an add-on.
 #
 # Arguments:
 #   $1 Add-on slug (optional, default: self)
@@ -603,7 +603,7 @@ function bashio::addon.network_description() {
 }
 
 # ------------------------------------------------------------------------------
-# Returns a user configured port number for a original port number.
+# Returns a user configured port number for an original port number.
 #
 # Arguments:
 #   $1 Original port number
@@ -783,7 +783,7 @@ function bashio::addon.usb() {
 }
 
 # ------------------------------------------------------------------------------
-# Returns whether or not this add-on has a icon available.
+# Returns whether or not this add-on has an icon available.
 #
 # Arguments:
 #   $1 Add-on slug
diff --git a/lib/api.sh b/lib/api.sh
index 10eca6d..7ef3a2b 100644
--- a/lib/api.sh
+++ b/lib/api.sh
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 # ==============================================================================
 # Home Assistant Community Add-ons: Bashio
-# Bashio is an bash function library for use with Home Assistant add-ons.
+# Bashio is a bash function library for use with Home Assistant add-ons.
 #
 # It contains a set of commonly used operations and can be used
 # to be included in add-on scripts to reduce code duplication across add-ons.
@@ -82,7 +82,7 @@ function bashio::api.supervisor() {
     fi
 
     if [[ "${status}" -ne 200 ]]; then
-        bashio::log.error "Unknown HTTP error occured"
+        bashio::log.error "Unknown HTTP error occurred"
         return "${__BASHIO_EXIT_NOK}"
     fi
 
diff --git a/lib/audio.sh b/lib/audio.sh
index a0e8c50..909a587 100644
--- a/lib/audio.sh
+++ b/lib/audio.sh
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 # ==============================================================================
 # Home Assistant Community Add-ons: Bashio
-# Bashio is an bash function library for use with Home Assistant add-ons.
+# Bashio is a bash function library for use with Home Assistant add-ons.
 #
 # It contains a set of commonly used operations and can be used
 # to be included in add-on scripts to reduce code duplication across add-ons.
diff --git a/lib/bashio b/lib/bashio
index f433afb..6bc05fd 100755
--- a/lib/bashio
+++ b/lib/bashio
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 # ==============================================================================
 # Home Assistant Community Add-ons: Bashio
-# Bashio is an bash function library for use with Home Assistant add-ons.
+# Bashio is a bash function library for use with Home Assistant add-ons.
 #
 # It contains a set of commonly used operations and can be used
 # to be included in add-on scripts to reduce code duplication across add-ons.
diff --git a/lib/bashio.sh b/lib/bashio.sh
index c5791de..03763f7 100644
--- a/lib/bashio.sh
+++ b/lib/bashio.sh
@@ -2,7 +2,7 @@
 # shellcheck disable=SC2034,SC2155
 # ==============================================================================
 # Home Assistant Community Add-ons: Bashio
-# Bashio is an bash function library for use with Home Assistant add-ons.
+# Bashio is a bash function library for use with Home Assistant add-ons.
 #
 # It contains a set of commonly used operations and can be used
 # to be included in add-on scripts to reduce code duplication across add-ons.
diff --git a/lib/cache.sh b/lib/cache.sh
index 7ae2ac5..910d0ce 100644
--- a/lib/cache.sh
+++ b/lib/cache.sh
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 # ==============================================================================
 # Home Assistant Community Add-ons: Bashio
-# Bashio is an bash function library for use with Home Assistant add-ons.
+# Bashio is a bash function library for use with Home Assistant add-ons.
 #
 # It contains a set of commonly used operations and can be used
 # to be included in add-on scripts to reduce code duplication across add-ons.
diff --git a/lib/cli.sh b/lib/cli.sh
index 010a368..b751698 100644
--- a/lib/cli.sh
+++ b/lib/cli.sh
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 # ==============================================================================
 # Home Assistant Community Add-ons: Bashio
-# Bashio is an bash function library for use with Home Assistant add-ons.
+# Bashio is a bash function library for use with Home Assistant add-ons.
 #
 # It contains a set of commonly used operations and can be used
 # to be included in add-on scripts to reduce code duplication across add-ons.
diff --git a/lib/color.sh b/lib/color.sh
index 5f2ece6..fe01137 100644
--- a/lib/color.sh
+++ b/lib/color.sh
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 # ==============================================================================
 # Home Assistant Community Add-ons: Bashio
-# Bashio is an bash function library for use with Home Assistant add-ons.
+# Bashio is a bash function library for use with Home Assistant add-ons.
 #
 # It contains a set of commonly used operations and can be used
 # to be included in add-on scripts to reduce code duplication across add-ons.
diff --git a/lib/config.sh b/lib/config.sh
index d14d597..d2a0c24 100644
--- a/lib/config.sh
+++ b/lib/config.sh
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 # ==============================================================================
 # Home Assistant Community Add-ons: Bashio
-# Bashio is an bash function library for use with Home Assistant add-ons.
+# Bashio is a bash function library for use with Home Assistant add-ons.
 #
 # It contains a set of commonly used operations and can be used
 # to be included in add-on scripts to reduce code duplication across add-ons.
@@ -544,13 +544,13 @@ function bashio::config.require.ssl() {
     if bashio::config.is_empty "${certfile}"; then
         bashio::log.fatal
         bashio::log.fatal "SSL has been enabled using the '${key}' option,"
-        bashio::log.fatal "this requires a SSL certificate file which is"
+        bashio::log.fatal "this requires an SSL certificate file which is"
         bashio::log.fatal "configured using the '${certfile}' option in the"
         bashio::log.fatal "add-on configuration."
         bashio::log.fatal
         bashio::log.fatal "Unfortunately, the '${certfile}' option is empty."
         bashio::log.fatal
-        bashio::log.fatal "Consider configuring or getting a SSL certificate"
+        bashio::log.fatal "Consider configuring or getting an SSL certificate"
         bashio::log.fatal "or setting the '${key}' option to 'false' in case"
         bashio::log.fatal "you are not planning on using SSL with this add-on."
         bashio::log.fatal
@@ -563,13 +563,13 @@ function bashio::config.require.ssl() {
     if bashio::config.is_empty "${keyfile}"; then
         bashio::log.fatal
         bashio::log.fatal "SSL has been enabled using the '${key}' option,"
-        bashio::log.fatal "this requires a SSL certificate key file which is"
+        bashio::log.fatal "this requires an SSL certificate key file which is"
         bashio::log.fatal "configured using the '${keyfile}' option in the"
         bashio::log.fatal "add-on configuration."
         bashio::log.fatal
         bashio::log.fatal "Unfortunately, the '${keyfile}' option is empty."
         bashio::log.fatal
-        bashio::log.fatal "Consider configuring or getting a SSL certificate"
+        bashio::log.fatal "Consider configuring or getting an SSL certificate"
         bashio::log.fatal "or setting the '${key}' option to 'false' in case"
         bashio::log.fatal "you are not planning on using SSL with this add-on."
         bashio::log.fatal
@@ -582,18 +582,18 @@ function bashio::config.require.ssl() {
     if ! bashio::fs.file_exists "/ssl/$(bashio::config "${certfile}")"; then
         bashio::log.fatal
         bashio::log.fatal "SSL has been enabled using the '${key}' option,"
-        bashio::log.fatal "this requires a SSL certificate file which is"
+        bashio::log.fatal "this requires an SSL certificate file which is"
         bashio::log.fatal "configured using the '${certfile}' option in the"
         bashio::log.fatal "add-on configuration."
         bashio::log.fatal
         bashio::log.fatal "Unfortunately, the file specified in the"
-        bashio::log.fatal "'${certfile}' option does not exists."
+        bashio::log.fatal "'${certfile}' option does not exist."
         bashio::log.fatal
         bashio::log.fatal "Please ensure the certificate file exists and"
         bashio::log.fatal "is placed in the '/ssl/' directory."
         bashio::log.fatal
         bashio::log.fatal "In case you don't have SSL yet, consider getting"
-        bashio::log.fatal "a SSL certificate or setting the '${key}' option"
+        bashio::log.fatal "an SSL certificate or setting the '${key}' option"
         bashio::log.fatal "to 'false' in case you are not planning on using"
         bashio::log.fatal "SSL with this add-on."
         bashio::log.fatal
@@ -606,18 +606,18 @@ function bashio::config.require.ssl() {
     if ! bashio::fs.file_exists "/ssl/$(bashio::config "${keyfile}")"; then
         bashio::log.fatal
         bashio::log.fatal "SSL has been enabled using the '${key}' option,"
-        bashio::log.fatal "this requires a SSL certificate key file which is"
+        bashio::log.fatal "this requires an SSL certificate key file which is"
         bashio::log.fatal "configured using the '${keyfile}' option in the"
         bashio::log.fatal "add-on configuration."
         bashio::log.fatal
         bashio::log.fatal "Unfortunately, the file specified in the"
-        bashio::log.fatal "'${keyfile}' option does not exists."
+        bashio::log.fatal "'${keyfile}' option does not exist."
         bashio::log.fatal
         bashio::log.fatal "Please ensure the certificate key file exists and"
         bashio::log.fatal "is placed in the '/ssl/' directory."
         bashio::log.fatal
         bashio::log.fatal "In case you don't have SSL yet, consider getting"
-        bashio::log.fatal "a SSL certificate or setting the '${key}' option"
+        bashio::log.fatal "an SSL certificate or setting the '${key}' option"
         bashio::log.fatal "to 'false' in case you are not planning on using"
         bashio::log.fatal "SSL with this add-on."
         bashio::log.fatal
diff --git a/lib/const.sh b/lib/const.sh
index 15dfcac..514d400 100644
--- a/lib/const.sh
+++ b/lib/const.sh
@@ -2,7 +2,7 @@
 # shellcheck disable=SC2004,SC2034
 # ==============================================================================
 # Home Assistant Community Add-ons: Bashio
-# Bashio is an bash function library for use with Home Assistant add-ons.
+# Bashio is a bash function library for use with Home Assistant add-ons.
 #
 # It contains a set of commonly used operations and can be used
 # to be included in add-on scripts to reduce code duplication across add-ons.
diff --git a/lib/core.sh b/lib/core.sh
index 354a20e..5910d78 100644
--- a/lib/core.sh
+++ b/lib/core.sh
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 # ==============================================================================
 # Home Assistant Community Add-ons: Bashio
-# Bashio is an bash function library for use with Home Assistant add-ons.
+# Bashio is a bash function library for use with Home Assistant add-ons.
 #
 # It contains a set of commonly used operations and can be used
 # to be included in add-on scripts to reduce code duplication across add-ons.
diff --git a/lib/debug.sh b/lib/debug.sh
index d6b1978..7ebd8f1 100644
--- a/lib/debug.sh
+++ b/lib/debug.sh
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 # ==============================================================================
 # Home Assistant Community Add-ons: Bashio
-# Bashio is an bash function library for use with Home Assistant add-ons.
+# Bashio is a bash function library for use with Home Assistant add-ons.
 #
 # It contains a set of commonly used operations and can be used
 # to be included in add-on scripts to reduce code duplication across add-ons.
diff --git a/lib/discovery.sh b/lib/discovery.sh
index f65c0d1..39ae30f 100644
--- a/lib/discovery.sh
+++ b/lib/discovery.sh
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 # ==============================================================================
 # Home Assistant Community Add-ons: Bashio
-# Bashio is an bash function library for use with Home Assistant add-ons.
+# Bashio is a bash function library for use with Home Assistant add-ons.
 #
 # It contains a set of commonly used operations and can be used
 # to be included in add-on scripts to reduce code duplication across add-ons.
diff --git a/lib/dns.sh b/lib/dns.sh
index 4e8ccca..ed27290 100644
--- a/lib/dns.sh
+++ b/lib/dns.sh
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 # ==============================================================================
 # Home Assistant Community Add-ons: Bashio
-# Bashio is an bash function library for use with Home Assistant add-ons.
+# Bashio is a bash function library for use with Home Assistant add-ons.
 #
 # It contains a set of commonly used operations and can be used
 # to be included in add-on scripts to reduce code duplication across add-ons.
diff --git a/lib/exit.sh b/lib/exit.sh
index b2fd30b..eb9afdd 100644
--- a/lib/exit.sh
+++ b/lib/exit.sh
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 # ==============================================================================
 # Home Assistant Community Add-ons: Bashio
-# Bashio is an bash function library for use with Home Assistant add-ons.
+# Bashio is a bash function library for use with Home Assistant add-ons.
 #
 # It contains a set of commonly used operations and can be used
 # to be included in add-on scripts to reduce code duplication across add-ons.
diff --git a/lib/fs.sh b/lib/fs.sh
index 6833ea2..651e5ab 100644
--- a/lib/fs.sh
+++ b/lib/fs.sh
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 # ==============================================================================
 # Home Assistant Community Add-ons: Bashio
-# Bashio is an bash function library for use with Home Assistant add-ons.
+# Bashio is a bash function library for use with Home Assistant add-ons.
 #
 # It contains a set of commonly used operations and can be used
 # to be included in add-on scripts to reduce code duplication across add-ons.
diff --git a/lib/hardware.sh b/lib/hardware.sh
index fc71b73..8bdabf4 100644
--- a/lib/hardware.sh
+++ b/lib/hardware.sh
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 # ==============================================================================
 # Home Assistant Community Add-ons: Bashio
-# Bashio is an bash function library for use with Home Assistant add-ons.
+# Bashio is a bash function library for use with Home Assistant add-ons.
 #
 # It contains a set of commonly used operations and can be used
 # to be included in add-on scripts to reduce code duplication across add-ons.
diff --git a/lib/host.sh b/lib/host.sh
index 429cdbe..443e896 100644
--- a/lib/host.sh
+++ b/lib/host.sh
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 # ==============================================================================
 # Home Assistant Community Add-ons: Bashio
-# Bashio is an bash function library for use with Home Assistant add-ons.
+# Bashio is a bash function library for use with Home Assistant add-ons.
 #
 # It contains a set of commonly used operations and can be used
 # to be included in add-on scripts to reduce code duplication across add-ons.
diff --git a/lib/info.sh b/lib/info.sh
index c002554..864e531 100644
--- a/lib/info.sh
+++ b/lib/info.sh
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 # ==============================================================================
 # Home Assistant Community Add-ons: Bashio
-# Bashio is an bash function library for use with Home Assistant add-ons.
+# Bashio is a bash function library for use with Home Assistant add-ons.
 #
 # It contains a set of commonly used operations and can be used
 # to be included in add-on scripts to reduce code duplication across add-ons.
diff --git a/lib/jq.sh b/lib/jq.sh
index 1c448be..ce0bb86 100644
--- a/lib/jq.sh
+++ b/lib/jq.sh
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 # ==============================================================================
 # Home Assistant Community Add-ons: Bashio
-# Bashio is an bash function library for use with Home Assistant add-ons.
+# Bashio is a bash function library for use with Home Assistant add-ons.
 #
 # It contains a set of commonly used operations and can be used
 # to be included in add-on scripts to reduce code duplication across add-ons.
diff --git a/lib/log.sh b/lib/log.sh
index 5d313b8..5048c59 100644
--- a/lib/log.sh
+++ b/lib/log.sh
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 # ==============================================================================
 # Home Assistant Community Add-ons: Bashio
-# Bashio is an bash function library for use with Home Assistant add-ons.
+# Bashio is a bash function library for use with Home Assistant add-ons.
 #
 # It contains a set of commonly used operations and can be used
 # to be included in add-on scripts to reduce code duplication across add-ons.
diff --git a/lib/multicast.sh b/lib/multicast.sh
index 8e91d0d..6a5009b 100644
--- a/lib/multicast.sh
+++ b/lib/multicast.sh
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 # ==============================================================================
 # Home Assistant Community Add-ons: Bashio
-# Bashio is an bash function library for use with Home Assistant add-ons.
+# Bashio is a bash function library for use with Home Assistant add-ons.
 #
 # It contains a set of commonly used operations and can be used
 # to be included in add-on scripts to reduce code duplication across add-ons.
diff --git a/lib/net.sh b/lib/net.sh
index e636ad8..7448bc1 100644
--- a/lib/net.sh
+++ b/lib/net.sh
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 # ==============================================================================
 # Home Assistant Community Add-ons: Bashio
-# Bashio is an bash function library for use with Home Assistant add-ons.
+# Bashio is a bash function library for use with Home Assistant add-ons.
 #
 # It contains a set of commonly used operations and can be used
 # to be included in add-on scripts to reduce code duplication across add-ons.
diff --git a/lib/network.sh b/lib/network.sh
index a263d76..b1926c6 100644
--- a/lib/network.sh
+++ b/lib/network.sh
@@ -2,7 +2,7 @@
 # shellcheck disable=SC2317
 # ==============================================================================
 # Home Assistant Community Add-ons: Bashio
-# Bashio is an bash function library for use with Home Assistant add-ons.
+# Bashio is a bash function library for use with Home Assistant add-ons.
 #
 # It contains a set of commonly used operations and can be used
 # to be included in add-on scripts to reduce code duplication across add-ons.
diff --git a/lib/observer.sh b/lib/observer.sh
index c672a15..1fb477f 100644
--- a/lib/observer.sh
+++ b/lib/observer.sh
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 # ==============================================================================
 # Home Assistant Community Add-ons: Bashio
-# Bashio is an bash function library for use with Home Assistant add-ons.
+# Bashio is a bash function library for use with Home Assistant add-ons.
 #
 # It contains a set of commonly used operations and can be used
 # to be included in add-on scripts to reduce code duplication across add-ons.
diff --git a/lib/os.sh b/lib/os.sh
index f4e1233..4bf6102 100644
--- a/lib/os.sh
+++ b/lib/os.sh
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 # ==============================================================================
 # Home Assistant Community Add-ons: Bashio
-# Bashio is an bash function library for use with Home Assistant add-ons.
+# Bashio is a bash function library for use with Home Assistant add-ons.
 #
 # It contains a set of commonly used operations and can be used
 # to be included in add-on scripts to reduce code duplication across add-ons.
diff --git a/lib/pwned.sh b/lib/pwned.sh
index 31a4a47..5e39631 100644
--- a/lib/pwned.sh
+++ b/lib/pwned.sh
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 # ==============================================================================
 # Home Assistant Community Add-ons: Bashio
-# Bashio is an bash function library for use with Home Assistant add-ons.
+# Bashio is a bash function library for use with Home Assistant add-ons.
 #
 # It contains a set of commonly used operations and can be used
 # to be included in add-on scripts to reduce code duplication across add-ons.
@@ -39,15 +39,15 @@ function bashio::pwned.is_safe_password() {
 # ------------------------------------------------------------------------------
 function bashio::pwned.occurances() {
     local password="${1}"
-    local occurances
+    local occurrences
 
     bashio::log.trace "${FUNCNAME[0]}" "<REDACTED PASSWORD>"
 
-    if ! occurances=$(bashio::pwned "${password}"); then
-        occurances="0"
+    if ! occurrences=$(bashio::pwned "${password}"); then
+        occurrences="0"
     fi
 
-    echo -n "${occurances}"
+    echo -n "${occurrences}"
     return "${__BASHIO_EXIT_OK}"
 }
 
diff --git a/lib/repositories.sh b/lib/repositories.sh
index 023f7f9..be1ef09 100644
--- a/lib/repositories.sh
+++ b/lib/repositories.sh
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 # ==============================================================================
 # Home Assistant Community Add-ons: Bashio
-# Bashio is an bash function library for use with Home Assistant add-ons.
+# Bashio is a bash function library for use with Home Assistant add-ons.
 #
 # It contains a set of commonly used operations and can be used
 # to be included in add-on scripts to reduce code duplication across add-ons.
diff --git a/lib/services.sh b/lib/services.sh
index 4fdde08..203fd9b 100644
--- a/lib/services.sh
+++ b/lib/services.sh
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 # ==============================================================================
 # Home Assistant Community Add-ons: Bashio
-# Bashio is an bash function library for use with Home Assistant add-ons.
+# Bashio is a bash function library for use with Home Assistant add-ons.
 #
 # It contains a set of commonly used operations and can be used
 # to be included in add-on scripts to reduce code duplication across add-ons.
diff --git a/lib/string.sh b/lib/string.sh
index 4ce0a2c..2ec2fe2 100644
--- a/lib/string.sh
+++ b/lib/string.sh
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 # ==============================================================================
 # Home Assistant Community Add-ons: Bashio
-# Bashio is an bash function library for use with Home Assistant add-ons.
+# Bashio is a bash function library for use with Home Assistant add-ons.
 #
 # It contains a set of commonly used operations and can be used
 # to be included in add-on scripts to reduce code duplication across add-ons.
diff --git a/lib/supervisor.sh b/lib/supervisor.sh
index 1e4e842..d181bcc 100644
--- a/lib/supervisor.sh
+++ b/lib/supervisor.sh
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 # ==============================================================================
 # Home Assistant Community Add-ons: Bashio
-# Bashio is an bash function library for use with Home Assistant add-ons.
+# Bashio is a bash function library for use with Home Assistant add-ons.
 #
 # It contains a set of commonly used operations and can be used
 # to be included in add-on scripts to reduce code duplication across add-ons.
diff --git a/lib/var.sh b/lib/var.sh
index bb8316c..d85f0f5 100644
--- a/lib/var.sh
+++ b/lib/var.sh
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 # ==============================================================================
 # Home Assistant Community Add-ons: Bashio
-# Bashio is an bash function library for use with Home Assistant add-ons.
+# Bashio is a bash function library for use with Home Assistant add-ons.
 #
 # It contains a set of commonly used operations and can be used
 # to be included in add-on scripts to reduce code duplication across add-ons.