diff --git a/automated install/basic-install.sh b/automated install/basic-install.sh
index fe2c7e4..38187a6 100755
--- a/automated install/basic-install.sh	
+++ b/automated install/basic-install.sh	
@@ -25,10 +25,9 @@ r=$(( rows / 2 ))
 c=$(( columns / 2 ))
 
 # Find IP used to route to outside world
-IPv4info=$(ip route get 8.8.8.8)
-IPv4dev=$(echo $IPv4info| awk '{print $5}')
-IPv4addr=$(ip -o -f inet addr show dev $IPv4dev | awk '{print $4}')
-IPv4gw=$(echo $IPv4info | awk '{print $3}')
+IPv4dev=$(ip route get 8.8.8.8 | awk '{for(i=1;i<=NF;i++)if($i~/dev/)print $(i+1)}')
+IPv4addr=$(ip -o -f inet addr show dev $IPv4dev | awk '{print $4}' | awk 'END {print}')
+IPv4gw=$(ip route get 8.8.8.8 | awk '{print $3}')
 
 # IPv6 support to be added later
 #IPv6eui64=$(ip addr show | awk '/scope\ global/ && /ff:fe/ {print $2}' | cut -d'/' -f1)
@@ -171,16 +170,23 @@ done
 fi
 }
 
-
-setStaticIPv4()
-{
-# Append these lines to /etc/dhcpcd.conf to enable a static IP
+setDHCPCD(){
+# Append these lines to dhcpcd.conf to enable a static IP
 echo "interface $piholeInterface
 static ip_address=$IPv4addr
 static routers=$IPv4gw
 static domain_name_servers=$IPv4gw" | sudo tee -a $dhcpcdFile >/dev/null
-echo "Setting IP to $IPv4addr.  You may need to restart after the install is complete."
-sudo ip addr replace dev $piholeInterface $IPv4addr
+}
+
+setStaticIPv4(){
+if grep -q $IPv4addr $dhcpcdFile; then
+	# address already set, noop
+	:
+else
+	setDHCPCD
+	sudo ip addr replace dev $piholeInterface $IPv4addr
+	echo "Setting IP to $IPv4addr.  You may need to restart after the install is complete."
+fi
 }
 
 installScripts(){
@@ -230,11 +236,6 @@ sudo mv /etc/crontab /etc/crontab.orig
 sudo curl -o /etc/crontab https://raw.githubusercontent.com/jacobsalmela/pi-hole/master/advanced/pihole.cron
 }
 
-installPiLog(){
-sudo touch /var/log/pihole.log
-sudo chmod 644 /var/log/pihole.log
-sudo chown dnsmasq:root /var/log/pihole.log
-}
 installPihole()
 {
 installDependencies
@@ -248,7 +249,6 @@ installConfigs
 installWebAdmin
 installPiholeWeb
 installCron
-installPiLog
 sudo /usr/local/bin/gravity.sh
 }
 
diff --git a/gravity.sh b/gravity.sh
index 170774c..66df1e3 100755
--- a/gravity.sh
+++ b/gravity.sh
@@ -12,8 +12,8 @@ if [[ -f $piholeIPfile ]];then
     rm $piholeIPfile
 else
     # Otherwise, the IP address can be taken directly from the machine, which will happen when the script is run by the user and not the installation script
-	IPv4dev=$(ip route get 8.8.8.8 | awk '{print $5}')
-	piholeIPCIDR=$(ip -o -f inet addr show dev $IPv4dev | awk '{print $4}')
+	IPv4dev=$(ip route get 8.8.8.8 | awk '{for(i=1;i<=NF;i++)if($i~/dev/)print $(i+1)}')
+	piholeIPCIDR=$(ip -o -f inet addr show dev $IPv4dev | awk '{print $4}' | awk 'END {print}')
 	piholeIP=${piholeIPCIDR%/*}
 fi