diff --git a/powerwall.sh b/powerwall.sh
index 4a82bb56..9bd40815 100755
--- a/powerwall.sh
+++ b/powerwall.sh
@@ -1477,7 +1477,7 @@ SHUTDOWN_SERVER(){
 			for ehost in "${PW_MAINSITE_HOSTS[@]}"; do
 				echo -en "${idsCL[LightCyan]}Stopping iSCSI-PRI VM's on: ${PW_ESXI_HOST_NAMES[${ehost}]} [${ehost}] ... "
 				[ "${TEST}" != "true" ] && ${PW_FOLDER}/esxi-scripts/iscsi-vm-shutdown.ps1 ${ehost} >/dev/null 2>&1 &
-				[ "${TEST}" != "true" ] && sleep 5s || echo -en "(TEST MODE)"
+				[ "${TEST}" != "true" ] && sleep 5s || echo -en "(TEST MODE) "
 				echo -e "${idsCL[Green]}Commands sent${idsCL[Default]}"
 			done
 			echo -e "${idsCL[LightYellow]}All iSCSI-PRI VM's have been sent shutdown signals\n"
@@ -1488,7 +1488,7 @@ SHUTDOWN_SERVER(){
 			for ehost in "${PW_MAINSITE_HOSTS[@]}"; do
 				echo -en "${idsCL[LightCyan]}Stopping iSCSI-SYS VM's on: ${PW_ESXI_HOST_NAMES[${ehost}]} [${ehost}] ... "
 				[ "${TEST}" != "true" ] && ${PW_FOLDER}/esxi-scripts/iscsi-sys-vm-shutdown.ps1 ${ehost} >/dev/null 2>&1 &
-				[ "${TEST}" != "true" ] && sleep 5s || echo -en "(TEST MODE)"
+				[ "${TEST}" != "true" ] && sleep 5s || echo -en "(TEST MODE) "
 				echo -e "${idsCL[Green]}Commands sent${idsCL[Default]}"
 			done
 			echo -e "${idsCL[LightYellow]}All iSCSI-SYS VM's have been sent shutdown signals\n"
@@ -1497,7 +1497,7 @@ SHUTDOWN_SERVER(){
 		
 		echo -en "${idsCL[LightCyan]}Enabling maintenance mode & starting any iSCSI VM migrations needed ... "
 		[ "${TEST}" != "true" ] && ${PW_FOLDER}/esxi-scripts/host-maintenance_mode.ps1 ${PW_VCENTER_HOST_NAMES[${ESXIHOST}]} >/dev/null 2>&1 &
-		[ "${TEST}" != "true" ] && sleep 25s || echo -en "(TEST MODE)"
+		[ "${TEST}" != "true" ] && sleep 25s || echo -en "(TEST MODE) "
 		echo -e "${idsCL[Green]}Done\n"
 	
 		echo -en "${idsCL[LightCyan]}Shutting down VM's ... "
@@ -1513,7 +1513,7 @@ SHUTDOWN_SERVER(){
 			fi
 			run=$(${PW_FOLDER}/esxi-scripts/cls-shutdown.ps1 ${ESXIHOST} >/dev/null 2>&1)
 		else
-			echo -en "(TEST MODE)"
+			echo -en "(TEST MODE) "
 		fi
 		echo -e "${idsCL[Green]}Done\n"
 		
@@ -1529,7 +1529,7 @@ SHUTDOWN_SERVER(){
 			
 			echo -en "${idsCL[LightCyan]}Powering off SAS Enclosure ... "
 			[ "${TEST}" != "true" ] && [ "$(CHECK_HOST 10.10.2.10)" == "false" ] && run=$(snmpset -v 1 -c private ${PW_APCPDU_IP} .1.3.6.1.4.1.318.1.1.12.3.3.1.1.4.14 i 2)
-			[ "${TEST}" != "true" ] && sleep 3s || echo -en "(TEST MODE)"
+			[ "${TEST}" != "true" ] && sleep 3s || echo -en "(TEST MODE) "
 			echo -e "${idsCL[Green]}Done\n"
 			
 		else
@@ -1649,20 +1649,32 @@ HOSTPOWER(){
 		if [ "${2^^}" == "ON" ] || [ "${2^^}" == "OFF" ] || [ "${2^^}" == "STATUS" ]; then
 			if [ "${idracip}" == "10.10.2.20" ] && [ "${2^^}" == "ON" ]; then
 				echo -en "${idsCL[LightCyan]}Powering ON the SAS Enclosure ... "
-				[ "${TEST}" != "true" ] && run=$(snmpset -v 1 -c private ${PW_APCPDU_IP} .1.3.6.1.4.1.318.1.1.12.3.3.1.1.4.14 i 1 >/dev/null 2>&1) || echo -en "(TEST MODE)"
-				sleep 3s
-				echo -e "${idsCL[Green]}Done\n"
+				if [ "${TEST}" != "true" ]; then
+					run=$(snmpset -v 1 -c private ${PW_APCPDU_IP} .1.3.6.1.4.1.318.1.1.12.3.3.1.1.4.14 i 1 >/dev/null 2>&1)
+					sleep 3s
+					echo -e "${idsCL[Green]}Done\n"
+				else
+					echo -e "(TEST MODE)"
+				fi
 			fi
 			
 			echo -e "${idsCL[Green]}"
-			[ "${TEST}" != "true" ] && ipmitool -I lanplus -H ${idracip} -U ${PW_ESXI_USER} -P "${PW_ESXI_PASS}" chassis power ${2,,} || echo -en "(TEST MODE)"
+			[ "${TEST}" != "true" ] && ipmitool -I lanplus -H ${idracip} -U ${PW_ESXI_USER} -P "${PW_ESXI_PASS}" chassis power ${2,,} || echo -en "(TEST MODE) "
 			echo -e "${idsCL[Default]}"
 			
 			if [ "${idracip}" == "10.10.2.20" ] && [ "${2^^}" == "OFF" ]; then
 				echo -en "${idsCL[LightCyan]}Powering OFF the SAS Enclosure ... "
-				[ "${TEST}" != "true" ] && [ "$(CHECK_HOST 10.10.2.10)" == "false" ] && run=$(snmpset -v 1 -c private ${PW_APCPDU_IP} .1.3.6.1.4.1.318.1.1.12.3.3.1.1.4.14 i 2 >/dev/null 2>&1) || echo -en "(TEST MODE)"
-				sleep 3s
-				echo -e "${idsCL[Green]}Done\n"
+				if [ "${TEST}" != "true" ]; then
+					if [ "$(CHECK_HOST 10.10.2.10)" == "false" ]; then
+						run=$(snmpset -v 1 -c private ${PW_APCPDU_IP} .1.3.6.1.4.1.318.1.1.12.3.3.1.1.4.14 i 2 >/dev/null 2>&1)
+						sleep 3s
+						echo -e "${idsCL[Green]}Done\n"
+					else
+						echo -e "${idsCL[LightRed]}'${PW_iDRACHOST_SHORTNAMES[${idracip}]}' is not offline, not powering down\n"
+					fi
+				else
+					echo -e "(TEST MODE) "
+				fi
 			fi
 		else
 			echo -e "${idsCL[LightRed]}'${2^^}' command is not recognized${idsCL[Default]}"
@@ -1670,7 +1682,7 @@ HOSTPOWER(){
 	else
 		echo -e "${idsCL[LightRed]}Host cannot be found for '${1}'${idsCL[Default]}"
 	fi
-	echo -e "\n"
+	echo -e "${idsCL[Default]}\n"
 }
 
 PDUCONTROL(){