diff --git a/CHANGELOG.md b/CHANGELOG.md
index 14ecb31..94177f0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,16 @@
 # The Changelog
 
+## 1.8
+### The Logical Release
+**Features**
+There is nothing really sexy here, but a lot of changes under the covers to improve reliablity between different SSH client types. A lot of the logic and functions are more consistent and cleaner. In some cultures, fewer bugs and more reliablity are considered features.
+
+- SSH/RSYNC connection logic rewritten to be specific to client options between OpenSSH, OpenSSH w/ SSHPASS, and Dropbear.
+- Key-pair generation functions rewritten to be specific to client options, also now works with no (or at least fewer) user prompts.
+- SSHPASS options should be more reliable if used, but removes messages that SSHPASS is not installed during setup, if it's not needed and Redirects user to documentation.
+- Adds custom port specification to ssh-copy-id and dropbearkey commands during configuration generation.
+- Generally better error handling of configuration options.
+
 ## 1.7
 ### The Andrew Release
 
@@ -11,13 +22,6 @@
 **Known Issues**
 - No new Star Trek references.
 
-#### 1.7.8
-- SSH/RSYNC connection logic rewritten to be specific to client options between OpenSSH, OpenSSH w/ SSHPASS, and Dropbear.
-- Removes INFO that SSHPASS is not installed during config, if it's not needed. Redirects user to documentation.
-- Better error handling of configuration options.
-- Adds custom port specification to ssh-copy-id and dropbearkey commands during configuration generation.
-- Key generation works with fewer no user prompts.
-
 #### 1.7.7
 - `config` function will attempt to ping remote host to validate network connection, can by bypassed by adding `PING_AVOID='1'` to your `gravity-sync.conf` file.
 - Changes some [INFO] messages to [WARN] where approprate.
diff --git a/gravity-sync.sh b/gravity-sync.sh
index 5ca7f54..b7b07eb 100755
--- a/gravity-sync.sh
+++ b/gravity-sync.sh
@@ -114,7 +114,7 @@ function update_gs {
 		echo_info
 	fi
 
-	GIT_CHECK=$(git status | awk '{print $1}')
+	GIT_CHECK=$(git status | sed 's/\s.*$//')
 	if [ "$GIT_CHECK" == "fatal:" ]
 	then
 		MESSAGE="Requires GitHub Installation" 
@@ -177,7 +177,7 @@ function pull_gs {
 			echo_stat
 		fi
 		
-		GRAVDB_RWE=$(namei -m ${PIHOLE_DIR}/${GRAVITY_FI} | grep -v f: | grep ${GRAVITY_FI} | awk '{print $1}')
+		GRAVDB_RWE=$(namei -m ${PIHOLE_DIR}/${GRAVITY_FI} | grep -v f: | grep ${GRAVITY_FI} | sed 's/\s.*$//')
 		if [ $GRAVDB_RWE != "-rw-rw-r--" ]
 		then
 			MESSAGE="Validating Permissions on ${GRAVITY_FI}"
@@ -242,7 +242,7 @@ function pull_gs {
 					echo_stat
 				fi
 			
-				CUSTOMLS_RWE=$(namei -m ${PIHOLE_DIR}/${CUSTOM_DNS} | grep -v f: | grep ${CUSTOM_DNS} | awk '{print $1}')
+				CUSTOMLS_RWE=$(namei -m ${PIHOLE_DIR}/${CUSTOM_DNS} | grep -v f: | grep ${CUSTOM_DNS} | sed 's/\s.*$//')
 				if [ $CUSTOMLS_RWE != "-rw-r--r--" ]
 				then
 					MESSAGE="Validating Permissions on ${CUSTOM_DNS}"
@@ -400,7 +400,7 @@ function restore_gs {
 	MESSAGE="Validating Permissions on ${GRAVITY_FI}"
 	echo_stat
 	
-		GRAVDB_RWE=$(namei -m ${PIHOLE_DIR}/${GRAVITY_FI} | grep -v f: | grep ${GRAVITY_FI} | awk '{print $1}')
+		GRAVDB_RWE=$(namei -m ${PIHOLE_DIR}/${GRAVITY_FI} | grep -v f: | grep ${GRAVITY_FI} | sed 's/\s.*$//')
 		if [ $GRAVDB_RWE = "-rw-rw-r--" ]
 		then
 			echo_good
@@ -447,7 +447,7 @@ function restore_gs {
 			MESSAGE="Validating Permissions on ${CUSTOM_DNS}"
 			echo_stat
 			
-				CUSTOMLS_RWE=$(namei -m ${PIHOLE_DIR}/${CUSTOM_DNS} | grep -v f: | grep ${CUSTOM_DNS} | awk '{print $1}')
+				CUSTOMLS_RWE=$(namei -m ${PIHOLE_DIR}/${CUSTOM_DNS} | grep -v f: | grep ${CUSTOM_DNS} | sed 's/\s.*$//')
 				if [ $CUSTOMLS_RWE == "-rw-r--r--" ]
 				then
 					echo_good