diff --git a/Makefile b/Makefile
index 84a5844..f4b7b8d 100755
--- a/Makefile
+++ b/Makefile
@@ -57,7 +57,7 @@ else
     #  $(info OS: $(PI_OS_VERSION) )
     #  GLIBC_VERSION = $(shell ldd --version | grep ldd)
     #  $(info GLIBC build with: $(GLIBC_VERSION) )
-    #  $(info GLIBC Prefered  : 2.24-11+deb9u1 2.24 )
+    #  $(info GLIBC Preferred  : 2.24-11+deb9u1 2.24 )
    endif
    # OSX
    ifeq ($(UNAME_S),Darwin)
@@ -111,7 +111,7 @@ SL_SRC = rs485mon.c aq_serial.c utils.c packetLogger.c rs_msg_utils.c timespec_s
 DD_SRC = dummy_device.c aq_serial.c utils.c packetLogger.c rs_msg_utils.c timespec_subtract.c
 DR_SRC = dummy_reader.c aq_serial.c utils.c packetLogger.c rs_msg_utils.c timespec_subtract.c
 
-# Build durectories
+# Build directories
 SRC_DIR := ./source
 OBJ_DIR := ./build
 DBG_OBJ_DIR := $(OBJ_DIR)/debug
@@ -214,15 +214,15 @@ runindocker:
 	sudo docker run -it --mount type=bind,source=./,target=/build aqualinkd-releasebin make dockerbuildnrun 
 	$(info Binaries for release have been built)
 
-# This is run inside container Dockerfile.releaseBinariies (aqualinkd-releasebin)
+# This is run inside container Dockerfile.releaseBinaries (aqualinkd-releasebin)
 buildrelease: clean armhf arm64 
 	$(shell cd release && ln -s ./aqualinkd-armhf ./aqualinkd && ln -s ./rs485mon-armhf ./rs485mon)
 
-# This is run inside container Dockerfile.releaseBinariies (aqualinkd-releasebin)
+# This is run inside container Dockerfile.releaseBinaries (aqualinkd-releasebin)
 quickbuild: armhf arm64 
 	$(shell cd release && [ ! -f "./aqualinkd-armhf" ] && ln -s ./aqualinkd-armhf ./aqualinkd && ln -s ./rs485mon-armhf ./rs485mon)
 
-# This is run inside container Dockerfile.releaseBinariies (aqualinkd-releasebin)
+# This is run inside container Dockerfile.releaseBinaries (aqualinkd-releasebin)
 dockerbuildnrun: ./release/aqualinkd
 	$(shell ./release/aqualinkd -d -c ./release/aqualinkd.test.conf)
 
diff --git a/docker/aqexec-pre.sh b/docker/aqexec-pre.sh
index f136f0f..824907e 100644
--- a/docker/aqexec-pre.sh
+++ b/docker/aqexec-pre.sh
@@ -6,8 +6,8 @@
 # This file should be placed in the config aqualinkd directory defined
 # in your docker-compose.yml (or equiv)
 #
-# MAKE SURE TO CHAGE THE IP BELOW (1.1.1.1)
-# aqualinkd.cong should have serial_port=/dev/ttyEW11
+# MAKE SURE TO CHANGE THE IP BELOW (1.1.1.1)
+# aqualinkd.conf should have serial_port=/dev/ttyEW11
 
 echo "Starting SOCAT port binding....."
 socat -d -d pty,link=/dev/ttyEW11,raw,ignoreeof TCP4:1.1.1.1:8899,ignoreeof &
diff --git a/docker/buildx.sh b/docker/buildx.sh
index 1e62228..38526a4 100755
--- a/docker/buildx.sh
+++ b/docker/buildx.sh
@@ -2,8 +2,8 @@
 #
 # Script to build arm64 & amd64 containers that are published to docker.io
 # 
-# This should never be used, unless you want to deploy AqualinkD docker containers to docer.io
-# It's here incase someone taked over this repo because I'm no longer around
+# This should never be used, unless you want to deploy AqualinkD docker containers to docker.io
+# It's here in case someone takes over this repo because I'm no longer around
 #
 
 IMAGE=aqualinkd
diff --git a/extras/aqua.sh b/extras/aqua.sh
index 08e90d8..7e89d8b 100755
--- a/extras/aqua.sh
+++ b/extras/aqua.sh
@@ -49,7 +49,7 @@ function print_usage {
   echoerr "$0 force_latest <- Force latest option (don't run any version checks)"
   echoerr "$0 install      <- Install to local filesystem, (config files will not be overwritten)"
   echoerr "$0 clean        <- Remove everything, including configuration files"
-  echoerr "$0 <option> downloadonly  <- Download using one of above options, but don't unstall"
+  echoerr "$0 <option> downloadonly  <- Download using one of above options, but don't install"
   echoerr ""
 }
 
diff --git a/extras/generate-certs.sh b/extras/generate-certs.sh
index 22080b1..1dd02b6 100755
--- a/extras/generate-certs.sh
+++ b/extras/generate-certs.sh
@@ -1,6 +1,6 @@
-#/bin/sh
+#!/bin/sh
 #
-# Geneate self-signed ECC certificates
+# Generate self-signed ECC certificates
 
 #cd `dirname $0`
 
diff --git a/release/aqualinkd.conf b/release/aqualinkd.conf
index 7ede297..d944c3e 100755
--- a/release/aqualinkd.conf
+++ b/release/aqualinkd.conf
@@ -161,9 +161,9 @@ display_warnings_in_web = yes
 # ignored.  You can force these to work by setting the below.
 #override_freeze_protect = yes
 
-# default is to use pool water temp as spa water temp when spa is off (and there for not able to report water temp)
+# default is to use pool water temp as spa water temp when spa is off (and therefore not able to report water temp)
 # enable below to report 0 as the spa temp when spa is off.
-# This is for MQTT cnnections only, WEB socket and WEB API always report TEMP_UNKNOWN (-999) allowing the consumer to
+# This is for MQTT connections only, WEB socket and WEB API always report TEMP_UNKNOWN (-999) allowing the consumer to
 # decide how to report.
 report_zero_spa_temp = yes
 # When pool or spa is off, report 0deg for water temp. If set to no, last known value will be used.
diff --git a/release/install.sh b/release/install.sh
index 03bfa04..6ab2463 100755
--- a/release/install.sh
+++ b/release/install.sh
@@ -53,7 +53,7 @@ log()
 
   if [[ $LOG_SYSTEMD -eq 0 ]]; then
     logger -p local0.notice -t aqualinkd.upgrade "Upgrade:   $*"
-    # Below is same as above but will only wotrk on journald (leaving it here if we use that rater then file)
+    # Below is same as above but will only work on journald (leaving it here if we use that rather than file)
     #echo $* | systemd-cat -t aqualinkd_upgrade -p info 
     #echo "$*" >> "$OUTPUT"
   fi
@@ -194,7 +194,7 @@ if [ "$PARENT_COMMAND" != "make" ] && [ "$_frommake" -eq $FALSE ] && [ "$_ignore
         log "Arch $ARCH is not officially supported, but we found a suitable binary"
         BINEXT="-$ARCH"
       else
-        log "Arch $ARCH is unknown, Default to using 32bit HF AqualinkD, you may need to manually try ./release/aqualnkd_arm64"
+        log "Arch $ARCH is unknown, Default to using 32bit HF AqualinkD, you may need to manually try ./release/aqualinkd-arm64"
         BINEXT=""
       fi
     ;;
diff --git a/source/allbutton_aq_programmer.c b/source/allbutton_aq_programmer.c
index 87c0186..5336c80 100644
--- a/source/allbutton_aq_programmer.c
+++ b/source/allbutton_aq_programmer.c
@@ -388,7 +388,7 @@ void *set_allbutton_SWG( void *ptr )
   }
 
   // Let everyone know we set SWG, if it failed we will update on next message, unless it's 0.
-  setSWGpercent(aqdata, val); // Don't use chageSWGpercent as we are in programming mode.
+  setSWGpercent(aqdata, val); // Don't use changeSWGpercent as we are in programming mode.
 
 /*
   if (select_sub_menu_item(aqdata, "SET POOL SP") != true) {
diff --git a/source/aqualink.h b/source/aqualink.h
index 56745b6..d1fddd7 100644
--- a/source/aqualink.h
+++ b/source/aqualink.h
@@ -8,7 +8,7 @@
 #include "aq_serial.h"
 #include "aq_programmer.h"
 #include "sensors.h"
-//#include "aq_panel.h"  // Moved to later in file to overcome circular dependancy. (crappy I know)
+//#include "aq_panel.h"  // Moved to later in file to overcome circular dependency. (crappy I know)
 
 #define DPRINTF(format, ...) printf("%s:%d: " format, __FILE__, __LINE__, ##__VA_ARGS__)
 //#define DPRINTF(format, ...)
@@ -188,7 +188,7 @@ struct action {
   //char value[10];
 };
 
-// Moved to aq_programmer to stop circular dependancy
+// Moved to aq_programmer to stop circular dependency
 /*
 typedef enum pump_type {
   PT_UNKNOWN = -1,
@@ -223,11 +223,11 @@ typedef enum SP_TYPE{
 #define PUMP_OFF_WAT PUMP_OFF_RPM
 
 
-// FUTURE VSP STATUS, keep panel status and RS485 status seperate
+// FUTURE VSP STATUS, keep panel status and RS485 status separate
 
 typedef enum panel_vsp_status
 {
-  PS_OK = 0,  // Start at 0 to match actual status from RS, but go down from their.
+  PS_OK = 0,  // Start at 0 to match actual status from RS, but go down from there.
   PS_OFF = -1,
   PS_PRIMING = -2,
   PS_OFFLINE = -3,
diff --git a/source/iaqtouch.c b/source/iaqtouch.c
index 7122126..80600bd 100644
--- a/source/iaqtouch.c
+++ b/source/iaqtouch.c
@@ -279,7 +279,7 @@ void processPageMessage(unsigned char *message, int length)
   
   if (_currentPageLoading == IAQ_PAGE_HOME || _currentPage == IAQ_PAGE_HOME) {
     rsm_strncpy(_homeStatus[(int)message[PKT_IAQT_MSGINDX]], &message[PKT_IAQT_MSGDATA], AQ_MSGLEN, length-PKT_IAQT_MSGDATA-3);
-  } else if (_currentPageLoading == IAQ_PAGE_STATUS || _currentPage == IAQ_PAGE_STATUS) { // 2nd page of device status doesn;t gine us new page message
+  } else if (_currentPageLoading == IAQ_PAGE_STATUS || _currentPage == IAQ_PAGE_STATUS) { // 2nd page of device status doesn't give us new page message
     //sprintf(_deviceStatus[(int)message[4]], message[5], AQ_MSGLEN);
     //strncpy(_deviceStatus[(int)message[PKT_IAQT_MSGINDX]], (char *)message + PKT_IAQT_MSGDATA, AQ_MSGLEN);
     rsm_strncpy(_deviceStatus[(int)message[PKT_IAQT_MSGINDX]], &message[PKT_IAQT_MSGDATA], AQ_MSGLEN, length-PKT_IAQT_MSGDATA-3);
diff --git a/source/mqtt_discovery.c b/source/mqtt_discovery.c
index 5dc3b24..4345835 100644
--- a/source/mqtt_discovery.c
+++ b/source/mqtt_discovery.c
@@ -345,8 +345,8 @@ const char *HASSIO_PUMP_TEXT_SENSOR_DISCOVER = "{"
     "\"icon\": \"mdi:pump\""
 "}";
 /*
-Below doesn;t work (int and string values).  Maybe try text sensor and add RPM/GPM to number
-Or add seperate text sensor. (this would be better options, that way you can see priming AND rpm)
+Below doesn't work (int and string values).  Maybe try text sensor and add RPM/GPM to number
+Or add separate text sensor. (this would be better options, that way you can see priming AND rpm)
 "value_template": "{% set values = { '-1':'priming', '-2':'offline', '-3':'error'} %}{{ values[value] if value in values.keys() else value }}",
 */
 const char *HASSIO_TEXT_SENSOR_DISCOVER = "{"
diff --git a/source/pda_aq_programmer.c b/source/pda_aq_programmer.c
index 829db88..6566abb 100644
--- a/source/pda_aq_programmer.c
+++ b/source/pda_aq_programmer.c
@@ -1345,7 +1345,7 @@ bool set_PDA_numeric_field_value(struct aqualinkdata *aqdata, int val, int cur_v
     char *hghlight_chars;
     int hlight_length=0;
     int i=0;
-    hghlight_chars = pda_m_hlightchars(&hlight_length); // NSF May need to take this out and there for the LOG entry after while
+    hghlight_chars = pda_m_hlightchars(&hlight_length); // NSF May need to take this out and therefore the LOG entry after while
     while (hlight_length >= 15 || hlight_length <= 0) {
       delay(500);
       waitForPDANextMessageType(aqdata,CMD_PDA_HIGHLIGHTCHARS,5);
diff --git a/source/rs485mon.c b/source/rs485mon.c
index 79a8f08..b3ac819 100644
--- a/source/rs485mon.c
+++ b/source/rs485mon.c
@@ -411,9 +411,9 @@ char* canUseExtended(unsigned char ID) {
   }
   for (i = 0; i < 4; i++) {
     if (ID == _goodIAQTID[i] && _panelPDA == false)
-      return " <-- can use for Aqualinkd (Prefered Extended Device ID)";
+      return " <-- can use for Aqualinkd (Preferred Extended Device ID)";
     else if (ID == _goodIAQTID[i] && _panelPDA == true)
-      return " <-- can use for Aqualinkd (PDA mode Expermental only)";
+      return " <-- can use for Aqualinkd (PDA mode Experimental only)";
   }
   for (i = 0; i < 2; i++) {
     if (ID == _goodRSSAID[i] && _panelPDA == false)