diff --git a/powerwall.sh b/powerwall.sh
index 25a3a826..5fa5c095 100755
--- a/powerwall.sh
+++ b/powerwall.sh
@@ -1923,23 +1923,34 @@ HOSTMGMT(){
 	DIVIDER . yellow 75
 	
 	if [ "${1}" != "-h" ]; then
-		HOST=${1}
+		HOST=${1}; MN=0
 		if [ "${PW_iDRACHOST_SHORTNAMES[${HOST}]}" != "" ]; then
 			tmp=${PW_iDRACHOST_SHORTNAMES[${HOST}]}
 			ESXI_HOST=${PW_HOST_ADDRESSES[${tmp}]}
 		elif [ "${PW_ESXI_HOST_NAMES[${HOST}]}" != "" ]; then
 			ESXI_HOST=${HOST}
-		elif [ "${PW_HOST_IDRACS[iDS-vMS-Host${HOST}]}" != "" ]; then
+		elif [ "${PW_HOST_ADDRESSES[iDS-vMS-Host${HOST}]}" != "" ]; then
 			ESXI_HOST=${PW_HOST_ADDRESSES[iDS-vMS-Host${HOST}]}
+		elif ([ "${HOST::1}" == "o" ] || [ "${HOST::1}" == "O" ]) && [ "${PW_HOST_ADDRESSES[OFF-vMS-Host${HOST: -1}]}" != "" ]; then
+			ESXI_HOST=${PW_HOST_ADDRESSES[OFF-vMS-Host${HOST: -1}]}
 		elif [ "${PW_HOST_ADDRESSES[${HOST}]}" != "" ]; then
 			ESXI_HOST=${PW_HOST_ADDRESSES[${HOST}]}
 		elif [ "${1^^}" == "ALL" ] || [ "${1^^}" == "MAINSITE" ] || [ "${1^^}" == "OFFSITE" ] || [ "${1^^}" == "MAIN" ] || [ "${1^^}" == "SYS" ]; then
 			ESXI_HOST=${HOST^^}
-			hostname="All ${1^^} Host Servers"
+			MN=1
 		else
 			ESXI_HOST=''
-		fi
+		fi		
 		[ "${ESXI_HOST}" == "" ] && echo -e "Invalid host\n" && exit 1
+		
+		if [ ${MN} -eq 1 ]; then
+			[ "${ESXI_HOST}" == "ALL" ] && hostname="All Host Servers" || hostname="All ${ESXI_HOST} Host Servers"
+		else
+			tmp=${PW_ESXI_HOST_NAMES[${ESXI_HOST}]}
+			idracip=${PW_HOST_IDRACS[${tmp}]}
+			hostname=${PW_iDRACHOST_SHORTNAMES[${idracip}]}
+		fi
+		
 		if [ "${PW_ESXI_HOST_NAMES[${ESXI_HOST}]}" != "" ]; then
 			tmp=${PW_ESXI_HOST_NAMES[${ESXI_HOST}]}
 			idracip=${PW_HOST_IDRACS[${tmp}]}
diff --git a/shutdown-test.sh b/shutdown-test.sh
index 1558a6f2..e7097dd6 100644
--- a/shutdown-test.sh
+++ b/shutdown-test.sh
@@ -10,7 +10,6 @@ SHUTDOWN_SERVER2(){
 			ESXI_HOST=${PW_HOST_ADDRESSES[iDS-vMS-Host${HOST}]}
 		elif ([ "${HOST::1}" == "o" ] || [ "${HOST::1}" == "O" ]) && [ "${PW_HOST_ADDRESSES[OFF-vMS-Host${HOST: -1}]}" != "" ]; then
 			ESXI_HOST=${PW_HOST_ADDRESSES[OFF-vMS-Host${HOST: -1}]}
-			echo $ESXI_HOST
 		elif [ "${PW_HOST_ADDRESSES[${HOST}]}" != "" ]; then
 			ESXI_HOST=${PW_HOST_ADDRESSES[${HOST}]}
 		elif [ "${1^^}" == "ALL" ] || [ "${1^^}" == "MAINSITE" ] || [ "${1^^}" == "OFFSITE" ] || [ "${1^^}" == "MAIN" ] || [ "${1^^}" == "SYS" ]; then