diff --git a/powerwall.sh b/powerwall.sh
index dfbd6ce5..8cb42d8a 100755
--- a/powerwall.sh
+++ b/powerwall.sh
@@ -498,12 +498,12 @@ HOSTMGMT(){
 		esac
 		shift 1
 	done
-	c=0; spcA=''; spc1=`expr 21 - ${#hostname} - 1`; until [ ${c} = ${spc1} ]; do spcA="${spcA} "; c=`expr ${c} + 1`; done
+	c=0; spcA=''; spc1=`expr 31 - ${#hostname} - 1`; until [ ${c} = ${spc1} ]; do spcA="${spcA} "; c=`expr ${c} + 1`; done
 	echo -en "${idsCL[LightCyan]} Host: ${idsCL[Green]}${hostname}${spcA}"
 	if [ "${ESXI_HOST}" == "ALL" ] || [ "${ESXI_HOST}" == "MAINSITE" ] || [ "${ESXI_HOST}" == "OFFSITE" ] || [ "${ESXI_HOST}" == "MAIN" ] || [ "${ESXI_HOST}" == "SYS" ]; then
 		echo -e ""
 	else
-		c=0; spcB=''; spc1=`expr 18 - ${#ESXI_HOST} - 1`; until [ ${c} = ${spc1} ]; do spcB="${spcB} "; c=`expr ${c} + 1`; done
+		c=0; spcB=''; spc1=`expr 28 - ${#ESXI_HOST} - 1`; until [ ${c} = ${spc1} ]; do spcB="${spcB} "; c=`expr ${c} + 1`; done
 		echo -en "${idsCL[LightCyan]}Host IP: ${idsCL[Green]}${ESXI_HOST}${spcB}"
 		echo -e "${idsCL[LightCyan]}iDrac IP: ${idsCL[Green]}${idracip}${idsCL[Default]}"
 	fi
@@ -587,37 +587,38 @@ ISCSISYSVMSHUTDOWN(){
 }
 
 HOSTPOWER(){
-	# if [ "${PW_iDRACHOST_SHORTNAMES[${1}]}" != "" ]; then
-	# 	idracip=${1}
-	# elif [ "${PW_ESXI_HOST_NAMES[${1}]}" != "" ]; then
-	# 	tmp=${PW_ESXI_HOST_NAMES[${1}]}
-	# 	idracip=${PW_HOST_IDRACS[${tmp}]}
-	# elif [ "${PW_HOST_IDRACS[iDS-vMS-Host${1}]}" != "" ]; then
-	# 	idracip=${PW_HOST_IDRACS[iDS-vMS-Host${1}]}
-	# elif [ "${PW_HOST_IDRACS[${1}]}" != "" ]; then
-	# 	idracip=${PW_HOST_IDRACS[${1}]}
-	# else
-	# 	idracip=''
-	# fi
-	
+	echo "HERE: ${1} - ${2}"
 	if [ "${PW_iDRACHOST_SHORTNAMES[${1}]}" != "" ]; then
-		tmp=${PW_iDRACHOST_SHORTNAMES[${1}]}
-		ESXI_HOST=${PW_HOST_ADDRESSES[${tmp}]}
+		idracip=${1}
 	elif [ "${PW_ESXI_HOST_NAMES[${1}]}" != "" ]; then
-		ESXI_HOST=${1}
-	elif [ "${PW_HOST_ADDRESSES[iDS-vMS-Host${1}]}" != "" ]; then
-		ESXI_HOST=${PW_HOST_ADDRESSES[iDS-vMS-Host${1}]}
-	elif ([ "${1::1}" == "o" ] || [ "${1::1}" == "O" ]) && [ "${PW_HOST_ADDRESSES[OFF-vMS-Host${1: -1}]}" != "" ]; then
-		ESXI_HOST=${PW_HOST_ADDRESSES[OFF-vMS-Host${1: -1}]}
-	elif [ "${PW_HOST_ADDRESSES[${1}]}" != "" ]; then
-		ESXI_HOST=${PW_HOST_ADDRESSES[${1}]}
-	elif [ "${1^^}" == "ALL" ] || [ "${1^^}" == "MAINSITE" ] || [ "${1^^}" == "OFFSITE" ] || [ "${1^^}" == "MAIN" ] || [ "${1^^}" == "SYS" ]; then
-		ESXI_HOST=${HOST^^}
-		MN=1
+		tmp=${PW_ESXI_HOST_NAMES[${1}]}
+		idracip=${PW_HOST_IDRACS[${tmp}]}
+	elif [ "${PW_HOST_IDRACS[iDS-vMS-Host${1}]}" != "" ]; then
+		idracip=${PW_HOST_IDRACS[iDS-vMS-Host${1}]}
+	elif [ "${PW_HOST_IDRACS[${1}]}" != "" ]; then
+		idracip=${PW_HOST_IDRACS[${1}]}
 	else
-		ESXI_HOST=''
+		idracip=''
 	fi
-	[ "${ESXI_HOST}" != "" ] && idracip=${PW_HOST_IDRACS[${PW_ESXI_HOST_NAMES[${ESXI_HOST}]}]} || idracip=''
+	
+	# if [ "${PW_iDRACHOST_SHORTNAMES[${1}]}" != "" ]; then
+	# 	tmp=${PW_iDRACHOST_SHORTNAMES[${1}]}
+	# 	ESXI_HOST=${PW_HOST_ADDRESSES[${tmp}]}
+	# elif [ "${PW_ESXI_HOST_NAMES[${1}]}" != "" ]; then
+	# 	ESXI_HOST=${1}
+	# elif [ "${PW_HOST_ADDRESSES[iDS-vMS-Host${1}]}" != "" ]; then
+	# 	ESXI_HOST=${PW_HOST_ADDRESSES[iDS-vMS-Host${1}]}
+	# elif ([ "${1::1}" == "o" ] || [ "${1::1}" == "O" ]) && [ "${PW_HOST_ADDRESSES[OFF-vMS-Host${1: -1}]}" != "" ]; then
+	# 	ESXI_HOST=${PW_HOST_ADDRESSES[OFF-vMS-Host${1: -1}]}
+	# elif [ "${PW_HOST_ADDRESSES[${1}]}" != "" ]; then
+	# 	ESXI_HOST=${PW_HOST_ADDRESSES[${1}]}
+	# elif [ "${1^^}" == "ALL" ] || [ "${1^^}" == "MAINSITE" ] || [ "${1^^}" == "OFFSITE" ] || [ "${1^^}" == "MAIN" ] || [ "${1^^}" == "SYS" ]; then
+	# 	ESXI_HOST=${HOST^^}
+	# 	MN=1
+	# else
+	# 	ESXI_HOST=''
+	# fi
+	# [ "${ESXI_HOST}" != "" ] && idracip=${PW_HOST_IDRACS[${PW_ESXI_HOST_NAMES[${ESXI_HOST}]}]} || idracip=''
 	
 	echo -e "\n${idsCL[Yellow]}POWERING ${2^^} '${PW_iDRACHOST_SHORTNAMES[${idracip}]}'"
 	DIVIDER . yellow 75