diff --git a/powerwall.sh b/powerwall.sh
index 16c0fb23..d21f13db 100755
--- a/powerwall.sh
+++ b/powerwall.sh
@@ -551,7 +551,7 @@ CHECKPOWER(){
 			OUTPUTA=`echo ${INVSTATSINFO} | jq '.outputs .outA'`
 			OUTPUTA2=`echo "scale=2; ${OUTPUTA}*2" | bc`
 			OUTPUTW=`echo ${INVSTATSINFO} | jq '.outputs .outW'`
-			[[ "${OUTPUTW}" == *"."* ]] && [[ "${OUTPUTW}" != *".0"* ]] && OUTPUTW=`printf "%'.2f\n" ${OUTPUTW}` || OUTPUTW=`printf "%'.0f\n" ${OUTPUTW}`
+			# [[ "${OUTPUTW}" == *"."* ]] && [[ "${OUTPUTW}" != *".0"* ]] && OUTPUTW=`printf "%'.2f\n" ${OUTPUTW}` || OUTPUTW=`printf "%'.0f\n" ${OUTPUTW}`
 			BATTV=`echo ${INVSTATSINFO} | jq '.inputs .battV'`
 			BATTA=`echo ${INVSTATSINFO} | jq '.inputs .xfA'`
 			BATTLIFE=`echo "scale=2; (${BATTV}*100)/54.6" | bc`
@@ -573,7 +573,7 @@ CHECKPOWER(){
 		echo
 		echo -e "${idsCL[White]}Inverter Output Volts    ${idsCL[Default]}: ${idsCL[Green]}${OUTPUTV}'volts / ${OUTPUTV2}'volts"
 		echo -e "${idsCL[White]}Inverter Output Amps     ${idsCL[Default]}: ${idsCL[Green]}${OUTPUTA}'amps / ${OUTPUTA2}'amps"
-		echo -e "${idsCL[White]}Inverter Output Watts    ${idsCL[Default]}: ${idsCL[Green]}${OUTPUTW}'watts"
+		echo -e "${idsCL[White]}Inverter Output Watts    ${idsCL[Default]}: ${idsCL[Green]}`printf "%'.1f\n" ${OUTPUTW}`'watts"
 		echo
 		echo -e "${idsCL[White]}Battery Voltage          ${idsCL[Default]}: ${idsCL[Green]}${BATTV}'volts ~ ${BATTLIFE}%${idsCL[Default]}"
 		echo -e "${idsCL[White]}Battery Amps Chg/DChg    ${idsCL[Default]}: ${BATTA_disp}${idsCL[Default]}"
@@ -584,7 +584,7 @@ CHECKPOWER(){
 			SVRRM_VOLT=$(snmpwalk -t 1 -r 0 -v 1 -c public ${PW_UPS_IP} iso.3.6.1.4.1.850.1.1.3.1.3.3.2.1.2.1.1 | sed 's/.*: //')
 			SVRRM_VOLT=`echo "scale=2; ${SVRRM_VOLT}/10" | bc`
 			SVRRM_WATT=$(snmpwalk  -t 1 -r 0 -v 1 -c public ${PW_UPS_IP} iso.3.6.1.4.1.850.1.1.3.1.3.3.2.1.4.1.1 | sed 's/.*: //')
-			[[ "${SVRRM_WATT}" == *"."* ]] && [[ "${SVRRM_WATT}" != *".0"* ]] && SVRRM_WATT_disp=`printf "%'.2f\n" ${SVRRM_WATT}` || SVRRM_WATT_disp=`printf "%'.0f\n" ${SVRRM_WATT}`
+			# [[ "${SVRRM_WATT}" == *"."* ]] && [[ "${SVRRM_WATT}" != *".0"* ]] && SVRRM_WATT_disp=`printf "%'.2f\n" ${SVRRM_WATT}` || SVRRM_WATT_disp=`printf "%'.0f\n" ${SVRRM_WATT}`
 			SVRRM_AMP=$(snmpwalk  -t 1 -r 0 -v 1 -c public ${PW_UPS_IP} iso.3.6.1.4.1.850.1.1.3.1.3.3.2.1.3.1.1 | sed 's/.*: //')
 			SVRRM_AMP=`echo "scale=2; ${SVRRM_AMP}/100" | bc`
 		# fi
@@ -593,20 +593,19 @@ CHECKPOWER(){
 			APCPDU_AMP=$(snmpwalk  -t 1 -r 0 -v 1 -c public ${PW_APCPDU_IP} .1.3.6.1.4.1.318.1.1.12.2.3.1.1.2.1 | sed 's/.*: //')
 			APCPDU_AMP=`echo "scale=2; ${APCPDU_AMP}/10" | bc`
 			APCPDU_WATT2=$(snmpwalk  -t 1 -r 0 -v 1 -c public ${PW_APCPDU_IP} .1.3.6.1.4.1.318.1.1.12.1.16.0 | sed 's/.*: //')
-			APCPDU_WATT2_disp=`printf "%'.0f\n" ${APCPDU_WATT2}`
 			APCPDU_WATT=`echo "scale=2; ${APCPDU_AMP}*${SVRRM_VOLT}" | bc`
-			[[ "${APCPDU_WATT}" == *"."* ]] && [[ "${APCPDU_WATT}" != *".0"* ]] && APCPDU_WATT_disp=`printf "%'.2f\n" ${APCPDU_WATT}` || APCPDU_WATT_disp=`printf "%'.0f\n" ${APCPDU_WATT}`
+			# [[ "${APCPDU_WATT}" == *"."* ]] && [[ "${APCPDU_WATT}" != *".0"* ]] && APCPDU_WATT_disp=`printf "%'.2f\n" ${APCPDU_WATT}` || APCPDU_WATT_disp=`printf "%'.0f\n" ${APCPDU_WATT}`
 		# fi
 
 		echo -e "${idsCL[White]}ServerRack Amps          ${idsCL[Default]}: ${idsCL[Green]}${APCPDU_AMP}'amps${idsCL[Default]}"
 		if [ "${avgdays}" != "" ]; then
 			average=$(AVERAGEPOWER ${PW_POWERSENSOR_ID['server-rack']} ${avgdays})
-			[[ "${average}" == *"."* ]] && [[ "${average}" != *".0"* ]] && average=`printf "%'.2f\n" ${average}` || average=`printf "%'.0f\n" ${average}`
-			average_disp="${idsCL[LightYellow]}	${average}'watts"
+			# [[ "${average}" == *"."* ]] && [[ "${average}" != *".0"* ]] && average=`printf "%'.2f\n" ${average}` || average=`printf "%'.0f\n" ${average}`
+			average_disp="${idsCL[LightYellow]}	`printf "%'.1f\n" ${average}`'watts"
 		else
 			average_disp=""
 		fi
-		echo -e "${idsCL[White]}ServerRack Wattage       ${idsCL[Default]}: ${idsCL[Green]}${APCPDU_WATT_disp}'watts ~ estimate ${idsCL[LightCyan]}(${APCPDU_WATT2_disp} watts)${average_disp}${idsCL[Default]}"
+		echo -e "${idsCL[White]}ServerRack Wattage       ${idsCL[Default]}: ${idsCL[Green]}`printf "%'.1f\n" ${APCPDU_WATT}`'watts ~ estimate ${idsCL[LightCyan]}(`printf "%'.1f\n" ${APCPDU_WATT2}` watts)${average_disp}${idsCL[Default]}"
 		echo
 
 		if [ "${SVRRM_VOLT}" != "" ]; then
@@ -614,7 +613,7 @@ CHECKPOWER(){
 				NETRK_AMP=`echo "scale=2; ${SVRRM_AMP}-${APCPDU_AMP}" | bc`
 				NETRK_WATT=`echo "scale=2; ${SVRRM_WATT}-${APCPDU_WATT}" | bc`
 				NETRK_WATT2=`echo "scale=2; ${SVRRM_WATT}-${APCPDU_WATT2}" | bc`
-				[[ "${NETRK_WATT}" == *"."* ]] && [[ "${NETRK_WATT}" != *".0"* ]] && NETRK_WATT=`printf "%'.2f\n" ${NETRK_WATT}` || NETRK_WATT=`printf "%'.0f\n" ${NETRK_WATT}`
+				# [[ "${NETRK_WATT}" == *"."* ]] && [[ "${NETRK_WATT}" != *".0"* ]] && NETRK_WATT=`printf "%'.2f\n" ${NETRK_WATT}` || NETRK_WATT=`printf "%'.0f\n" ${NETRK_WATT}`
 			fi
 			VOLT_DROP=`echo "scale=1; ${OUTPUTV2}-${SVRRM_VOLT}" | bc`
 		fi
@@ -622,12 +621,12 @@ CHECKPOWER(){
 		echo -e "${idsCL[White]}NetworkRack Amps         ${idsCL[Default]}: ${idsCL[Green]}${NETRK_AMP}'amps ~ estimate${idsCL[Default]}"
 		if [ "${avgdays}" != "" ]; then
 			average=$(AVERAGEPOWER ${PW_POWERSENSOR_ID['network-rack']} ${avgdays})
-			[[ "${average}" == *"."* ]] && [[ "${average}" != *".0"* ]] && average=`printf "%'.2f\n" ${average}` || average=`printf "%'.0f\n" ${average}`
-			average_disp="${idsCL[LightYellow]} 	${average}'watts"
+			# [[ "${average}" == *"."* ]] && [[ "${average}" != *".0"* ]] && average=`printf "%'.2f\n" ${average}` || average=`printf "%'.0f\n" ${average}`
+			average_disp="${idsCL[LightYellow]} 	`printf "%'.1f\n" ${average}`'watts"
 		else
 			average_disp=""
 		fi
-		echo -e "${idsCL[White]}NetworkRack Wattage      ${idsCL[Default]}: ${idsCL[Green]}${NETRK_WATT}'watts ~ estimate${average_disp} ${idsCL[LightCyan]}(`printf "%'.1f\n" ${NETRK_WATT2}` watts)${idsCL[Default]}"
+		echo -e "${idsCL[White]}NetworkRack Wattage      ${idsCL[Default]}: ${idsCL[Green]}`printf "%'.1f\n" ${NETRK_WATT}`'watts ~ estimate${average_disp} ${idsCL[LightCyan]}(`printf "%'.1f\n" ${NETRK_WATT2}` watts)${idsCL[Default]}"
 		echo
 
 		echo -e "${idsCL[White]}Voltage                  ${idsCL[Default]}: ${idsCL[Green]}${SVRRM_VOLT}'volts${idsCL[Default]}"
@@ -635,12 +634,12 @@ CHECKPOWER(){
 		echo -e "${idsCL[White]}Total Amps               ${idsCL[Default]}: ${idsCL[Green]}${SVRRM_AMP}'amps${idsCL[Default]}"
 		if [ "${avgdays}" != "" ]; then
 			average=$(AVERAGEPOWER ${PW_POWERSENSOR_ID['total']} ${avgdays})
-			[[ "${average}" == *"."* ]] && [[ "${average}" != *".0"* ]] && average=`printf "%'.2f\n" ${average}` || average=`printf "%'.0f\n" ${average}`
-			average_disp="${idsCL[LightYellow]}			${average}'watts"
+			# [[ "${average}" == *"."* ]] && [[ "${average}" != *".0"* ]] && average=`printf "%'.2f\n" ${average}` || average=`printf "%'.0f\n" ${average}`
+			average_disp="${idsCL[LightYellow]}			`printf "%'.1f\n" ${average}`'watts"
 		else
 			average_disp=""
 		fi
-		echo -e "${idsCL[White]}Total Wattage            ${idsCL[Default]}: ${idsCL[Green]}${SVRRM_WATT_disp}'watts${average_disp}${idsCL[Default]}"
+		echo -e "${idsCL[White]}Total Wattage            ${idsCL[Default]}: ${idsCL[Green]}`printf "%'.1f\n" ${SVRRM_WATT}`'watts${average_disp}${idsCL[Default]}"
 		echo
 		
 	fi