diff --git a/powerwall.sh b/powerwall.sh
index c6829e29..4acb372f 100755
--- a/powerwall.sh
+++ b/powerwall.sh
@@ -48,8 +48,8 @@ CHECKTEMP(){
 						FanSpeed=`echo "scale=2; ${vHOSTFAN}/21200" | bc`; FanSpeed=`echo "scale=0; ${FanSpeed}*100" | bc | sed -e 's/.00//g'`
 						if [ ${FanSpeed} -gt 92 ]; then
 							SENDNOTICE "${vHOSTiDRACIP} Fan Issue" "Workaround commands sent to set the Fans at 30%" 1
-							ipmitool -I lanplus -H ${vHOSTiDRACIP} -U ${PW_ESXI_USER} -P "'${PW_ESXI_PASS}'" raw 0x30 0x30 0x01 0x00
-							ipmitool -I lanplus -H ${vHOSTiDRACIP} -U ${PW_ESXI_USER} -P "'${PW_ESXI_PASS}'" raw 0x30 0x30 0x02 0xff 0x1E
+							ipmitool -I lanplus -H ${vHOSTiDRACIP} -U ${PW_ESXI_USER} -P "${PW_ESXI_PASS}" raw 0x30 0x30 0x01 0x00
+							ipmitool -I lanplus -H ${vHOSTiDRACIP} -U ${PW_ESXI_USER} -P "${PW_ESXI_PASS}" raw 0x30 0x30 0x02 0xff 0x1E
 						fi
 
 					fi
@@ -233,12 +233,11 @@ CHECKTEMP_SERVICE(){
 					if [ "${PW_HOST_IDRACS[${SENSORa}]}" == "10.2.1.21" ]; then
 						vHOSTFAN=$(snmpwalk -v 1 -c public -t 2 ${PW_HOST_IDRACS[${SENSORa}]} .1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.1 -O vq)
 						FanSpeed=`echo "scale=2; ${vHOSTFAN}/16561" | bc`; FanSpeed=`echo "scale=0; ${FanSpeed}*100" | bc | sed -e 's/.00//g'`
-						echo "HERE: ${vHOSTFAN} - ${FanSpeed}"
 						if [ ${FanSpeed} -gt 92 ]; then
 							SENDNOTICE "${PW_HOST_IDRACS[${SENSORa}]} Fan Issue" "Workaround commands sent to set the Fans at 30%25" 1
-							echo "ipmitool -I lanplus -H ${PW_HOST_IDRACS[${SENSORa}]} -U ${PW_ESXI_USER} -P "'${PW_ESXI_PASS}'" raw 0x30 0x30 0x01 0x00"
-							ipmitool -I lanplus -H ${PW_HOST_IDRACS[${SENSORa}]} -U ${PW_ESXI_USER} -P "'${PW_ESXI_PASS}'" raw 0x30 0x30 0x01 0x00
-							ipmitool -I lanplus -H ${PW_HOST_IDRACS[${SENSORa}]} -U ${PW_ESXI_USER} -P "'${PW_ESXI_PASS}'" raw 0x30 0x30 0x02 0xff 0xff
+							echo "ipmitool -I lanplus -H ${PW_HOST_IDRACS[${SENSORa}]} -U ${PW_ESXI_USER} -P "${PW_ESXI_PASS}" raw 0x30 0x30 0x01 0x00"
+							ipmitool -I lanplus -H ${PW_HOST_IDRACS[${SENSORa}]} -U ${PW_ESXI_USER} -P "${PW_ESXI_PASS}" raw 0x30 0x30 0x01 0x00
+							ipmitool -I lanplus -H ${PW_HOST_IDRACS[${SENSORa}]} -U ${PW_ESXI_USER} -P "${PW_ESXI_PASS}" raw 0x30 0x30 0x02 0xff 0x1E
 							FanSpeed=30
 						fi
 					fi
@@ -314,8 +313,8 @@ CHECKTEMP_SERVICE(){
 									# iDS-vMS-Offsite Fan Issue Workaround
 									if [ "${PW_HOST_IDRACS[${SENSORa}]}" == "10.2.1.21" ] && [ ${FanSpeed} -ne 80 ]; then
 										SENDNOTICE "${PW_HOST_IDRACS[${SENSORa}]} SERVER WARM" "Setting fan speeds to 80%25" 1
-										ipmitool -I lanplus -H ${PW_HOST_IDRACS[${SENSORa}]} -U ${PW_ESXI_USER} -P "'${PW_ESXI_PASS}'" raw 0x30 0x30 0x01 0x00
-										ipmitool -I lanplus -H ${PW_HOST_IDRACS[${SENSORa}]} -U ${PW_ESXI_USER} -P "'${PW_ESXI_PASS}'" raw 0x30 0x30 0x02 0xff 0x50
+										ipmitool -I lanplus -H ${PW_HOST_IDRACS[${SENSORa}]} -U ${PW_ESXI_USER} -P "${PW_ESXI_PASS}" raw 0x30 0x30 0x01 0x00
+										ipmitool -I lanplus -H ${PW_HOST_IDRACS[${SENSORa}]} -U ${PW_ESXI_USER} -P "${PW_ESXI_PASS}" raw 0x30 0x30 0x02 0xff 0x50
 									fi							
 								fi
 		
@@ -377,8 +376,8 @@ Previous Temp: ${last_temp[${SENSOR}]}'F"
 								# iDS-vMS-Offsite Fan Issue Workaround
 								if [ "${PW_HOST_IDRACS[${SENSORa}]}" == "10.2.1.21" ] && [ ${FanSpeed} -ne 30 ]; then
 									SENDNOTICE "${PW_HOST_IDRACS[${SENSORa}]} Fan Issue" "Settings fans back to normal 30%25"
-									ipmitool -I lanplus -H ${PW_HOST_IDRACS[${SENSORa}]} -U ${PW_ESXI_USER} -P "'${PW_ESXI_PASS}'" raw 0x30 0x30 0x01 0x00
-									ipmitool -I lanplus -H ${PW_HOST_IDRACS[${SENSORa}]} -U ${PW_ESXI_USER} -P "'${PW_ESXI_PASS}'" raw 0x30 0x30 0x02 0xff 0x1E
+									ipmitool -I lanplus -H ${PW_HOST_IDRACS[${SENSORa}]} -U ${PW_ESXI_USER} -P "${PW_ESXI_PASS}" raw 0x30 0x30 0x01 0x00
+									ipmitool -I lanplus -H ${PW_HOST_IDRACS[${SENSORa}]} -U ${PW_ESXI_USER} -P "${PW_ESXI_PASS}" raw 0x30 0x30 0x02 0xff 0x1E
 								fi
 							fi
 		
@@ -1372,7 +1371,7 @@ HOSTPOWER(){
 			fi
 			
 			echo -e "${idsCL[Green]}"
-			ipmitool -I lanplus -H ${idracip} -U ${PW_ESXI_USER} -P "'${PW_ESXI_PASS}'" chassis power ${2,,}
+			ipmitool -I lanplus -H ${idracip} -U ${PW_ESXI_USER} -P "${PW_ESXI_PASS}" chassis power ${2,,}
 			echo -e "${idsCL[Default]}"
 			
 			if [ "${idracip}" == "10.10.2.20" ] && [ "${2,,}" == "off" ]; then