diff --git a/ping.sh b/ping.sh
index 4361098..947b3b8 100755
--- a/ping.sh
+++ b/ping.sh
@@ -1,37 +1,40 @@
 #!/bin/bash
 
-echo -e "DigitalOcean Ping Test:\n"
+printf "DigitalOcean Ping Test:\n\n"
 
 for DC in NYC1 NYC2 NYC3 SFO1 SFO2 TOR1 LON1 FRA1 AMS2 AMS3 SGP1 BLR1
 do
-    echo "$DC: $(ping -i .2 -c 10 -q speedtest-$DC.digitalocean.com | awk -F/ '/^round|^rtt/{print $5}') ms"
+    printf "$DC: \t$(ping -i .2 -c 10 -q speedtest-$DC.digitalocean.com | awk -F/ '/^round|^rtt/{print $5}') ms\n" | expand -t 20
 done
 
-echo -e "\n\nLinode Ping Test:\n"
+
+printf "\n\nLinode Ping Test:\n\n"
 
 for DC in Newark Atlanta Dallas Fremont London Frankfurt Singapore Tokyo2
 do
-    echo "$DC: $(ping -i .2 -c 10 -q speedtest.$DC.linode.com | awk -F/ '/^round|^rtt/{print $5}') ms"
+    printf "$DC: \t$(ping -i .2 -c 10 -q speedtest.$DC.linode.com | awk -F/ '/^round|^rtt/{print $5}') ms\n" | expand -t 20
 done
 
-echo -e "\n\nAWS Ping Test:\n"
+
+printf "\n\nAWS Ping Test:\n\n"
 
 for DC in us-east-1 us-west-1 us-west-2 eu-north-1 ca-central-1 eu-central-1 eu-west-1 eu-west-2 ap-northeast-1 ap-south-1 ap-southeast-1 ap-southeast-2 sa-east-1
 do
-    echo "$DC: $(ping -i .2 -c 10 -q ec2.$DC.amazonaws.com | awk -F/ '/^round|^rtt/{print $5}') ms"
+    printf "$DC: \t$(ping -i .2 -c 10 -q ec2.$DC.amazonaws.com | awk -F/ '/^round|^rtt/{print $5}') ms\n" | expand -t 20
 done
 
-echo -e "\n\nGCP Ping Test:\n"
 
-for DC in us-central1 us-east1 us-east4 us-west1 northamerica-northeast1 asia-east1 asia-east2 asia-northeast1 asia-south1 asia-southeast1 australia-southeast1 europe-north1 europe-west1 europe-west2 europe-west3 europe-west4 southamerica-east1
+printf "\n\nGCP Ping Test:\n\n"
+
+for DC in us-east1 us-east4 us-west1 us-central1 northamerica-northeast1 asia-east1 asia-east2 asia-northeast1 asia-south1 asia-southeast1 australia-southeast1 europe-north1 europe-west1 europe-west2 europe-west3 europe-west4 southamerica-east1
 do
-    echo "$DC: $(ping -i .2 -c 10 -q $DC-gce.cloudharmony.net | awk -F/ '/^round|^rtt/{print $5}') ms"
+    printf "$DC: \t$(ping -i .2 -c 10 -q $DC-gce.cloudharmony.net | awk -F/ '/^round|^rtt/{print $5}') ms\n" | expand -t 20
 done
 
 
-echo -e "\n\nVultr/Choopa Ping Test:\n"
+printf "\n\nVultr/Choopa Ping Test:\n\n"
 
-for DC in nj-us il-us ga-us fl-us tx-us sjo-ca-us wa-us tor-ca fra-de ams-nl par-fr lon-gb syd-au sgp hnd-jp
+for DC in NJ-US IL-US GA-US FL-US TX-US SJO-CA-US WA-US TOR-CA FRA-DE AMS-NL PAR-FR LON-GB SYD-AU SGP HND-JP
 do
-    echo "$DC: $(ping -i .2 -c 10 -q $DC-ping.vultr.com | awk -F/ '/^round|^rtt/{print $5}') ms"
+    printf "$DC: \t$(ping -i .2 -c 10 -q $DC-ping.vultr.com | awk -F/ '/^round|^rtt/{print $5}') ms\n" | expand -t 20
 done
diff --git a/speed.sh b/speed.sh
index c490d9d..8d80f49 100755
--- a/speed.sh
+++ b/speed.sh
@@ -1,36 +1,57 @@
 #!/bin/bash
 
-echo -e "DigitalOcean Speed Test: (100MB each)\n"
+function spinner()
+{
+    local lines='|/-\'
+    while [ "$(ps a | awk '{print $1}' | grep $1)" ]; do
+        local temp=${lines#?}
+        printf "\r [%c]  " "$lines"
+        local lines=$temp${lines%"$temp"}
+        sleep 0.15
+    done
+    printf "\r"
+}
+
+printf "DigitalOcean Speed Test: (100MB each)\n\n"
 
 for DC in NYC1 NYC2 NYC3 SFO1 SFO2 TOR1 LON1 FRA1 AMS2 AMS3 SGP1 BLR1
 do
-    echo "$DC: $(wget -O /dev/null http://speedtest-$DC.digitalocean.com/100mb.test 2>&1 | awk '/\/dev\/null/ {speed=$3 $4} END {gsub(/\(|\)/,"",speed); print speed}')"
+    printf "$DC: \e\n"
+    printf "$(wget -O /dev/null http://speedtest-$DC.digitalocean.com/100mb.test 2>&1 | awk '/\/dev\/null/ {speed=$3 $4} END {gsub(/\(|\)/,"",speed); print speed}')\e\n" & spinner $!
 done
 
-echo -e "\n\nLinode Speed Test: (100MB each)\n"
+
+printf "\n\nLinode Speed Test: (100MB each)\n\n"
 
 for DC in newark atlanta dallas fremont london frankfurt singapore tokyo2
 do
-    echo "$DC: $(wget -O /dev/null http://speedtest.$DC.linode.com/100MB-$DC.bin 2>&1 | awk '/\/dev\/null/ {speed=$3 $4} END {gsub(/\(|\)/,"",speed); print speed}')"
+    printf "$DC: \e\n"
+    printf "$(wget -O /dev/null http://speedtest.$DC.linode.com/100MB-$DC.bin 2>&1 | awk '/\/dev\/null/ {speed=$3 $4} END {gsub(/\(|\)/,"",speed); print speed}')\e\n" & spinner $!
 done
 
-echo -e "\n\nAWS Speed Test: (10MB each)\n"
+
+printf "\n\nAWS Speed Test: (10MB each)\n\n"
 
 for DC in us-east-1 us-west-1 us-west-2 eu-north-1 ca-central-1 eu-central-1 eu-west-1 eu-west-2 ap-northeast-1 ap-south-1 ap-southeast-1 ap-southeast-2 sa-east-1
 do
-    echo "$DC: $(wget -O /dev/null http://$DC-ec2.cloudharmony.net/probe/test10mb.jpg 2>&1 | awk '/\/dev\/null/ {speed=$3 $4} END {gsub(/\(|\)/,"",speed); print speed}')"
+    printf "$DC: \e\n"
+    printf "$(wget -O /dev/null http://$DC-ec2.cloudharmony.net/probe/test10mb.jpg 2>&1 | awk '/\/dev\/null/ {speed=$3 $4} END {gsub(/\(|\)/,"",speed); print speed}')\e\n" & spinner $!
 done
 
-echo -e "\n\nGCP Speed Test: (10MB each)\n"
 
-for DC in us-central1 us-east1 us-east4 us-west1 northamerica-northeast1 asia-east1 asia-east2 asia-northeast1 asia-south1 asia-southeast1 australia-southeast1 europe-north1 europe-west1 europe-west2 europe-west3 europe-west4 southamerica-east1
+printf "\n\nGCP Speed Test: (10MB each)\n\n"
+
+for DC in us-east1 us-east4 us-west1 us-central1 northamerica-northeast1 asia-east1 asia-east2 asia-northeast1 asia-south1 asia-southeast1 australia-southeast1 europe-north1 europe-west1 europe-west2 europe-west3 europe-west4 southamerica-east1
 do
-    echo "$DC: $(wget -O /dev/null http://$DC-gce.cloudharmony.net/probe/test10mb.jpg 2>&1 | awk '/\/dev\/null/ {speed=$3 $4} END {gsub(/\(|\)/,"",speed); print speed}')"
+    printf "$DC: \e\n"
+    printf "$(wget -O /dev/null http://$DC-gce.cloudharmony.net/probe/test10mb.jpg 2>&1 | awk '/\/dev\/null/ {speed=$3 $4} END {gsub(/\(|\)/,"",speed); print speed}')\e\n" & spinner $!
 done
 
-echo -e "\n\nVultr/Choopa Speed Test: (100MB each)\n"
 
-for DC in nj-us il-us ga-us fl-us tx-us sjo-ca-us wa-us tor-ca fra-de ams-nl par-fr lon-gb syd-au sgp hnd-jp
+printf "\n\nVultr/Choopa Speed Test: (100MB each)\n\n"
+
+for DC in NJ-US IL-US GA-US FL-US TX-US SJO-CA-US WA-US TOR-CA FRA-DE AMS-NL PAR-FR LON-GB SYD-AU SGP HND-JP
 do
-    echo "$DC: $(wget -O /dev/null http://$DC-ping.vultr.com/vultr.com.100MB.bin 2>&1 | awk '/\/dev\/null/ {speed=$3 $4} END {gsub(/\(|\)/,"",speed); print speed}')"
-done
\ No newline at end of file
+    printf "$DC: \e\n"
+    printf "$(wget -O /dev/null http://$DC-ping.vultr.com/vultr.com.100MB.bin 2>&1 | awk '/\/dev\/null/ {speed=$3 $4} END {gsub(/\(|\)/,"",speed); print speed}')\e\n" & spinner $!
+done