diff --git a/powerwall.sh b/powerwall.sh
index 13a9a291..f0370055 100755
--- a/powerwall.sh
+++ b/powerwall.sh
@@ -556,25 +556,25 @@ CHECKPOWER(){
 			BATTLIFE=`echo "scale=2; (${BATTV}*100)/54.6" | bc`
 			if (( $(bc <<<"${BATTV} > 54.8") )); then
 				if (( $(bc <<<"${BATTV} > 58") )); then
-					BATTA_disp="${idsCL[Green]}${BATTA}'amps ${idsCL[LightCyan]}- Bulk Charging"
+					BATTA_disp="${idsCL[Green]}`IDS_NUMBER_FORMAT ${BATTA} 2`'amps ${idsCL[LightCyan]}- Bulk Charging"
 				else
-					BATTA_disp="${idsCL[Green]}${BATTA}'amps ${idsCL[LightCyan]}- Float Charging"
+					BATTA_disp="${idsCL[Green]}`IDS_NUMBER_FORMAT ${BATTA} 2`'amps ${idsCL[LightCyan]}- Float Charging"
 				fi
 			elif [ "${BATTA}" == "-0.1" ]; then
-				BATTA_disp="${idsCL[LightCyan]}${BATTA}'amps ${idsCL[LightCyan]}- Standby"
+				BATTA_disp="${idsCL[LightCyan]}`IDS_NUMBER_FORMAT ${BATTA} 2`'amps ${idsCL[LightCyan]}- Standby"
 			else
-				BATTA_disp="${idsCL[LightRed]}${BATTA}'amps ${idsCL[LightCyan]}- Discharging"
+				BATTA_disp="${idsCL[LightRed]}`IDS_NUMBER_FORMAT ${BATTA} 2`'amps ${idsCL[LightCyan]}- Discharging"
 			fi
 		fi
 
 		echo -e "${idsCL[White]}Inverter Input Volts     ${idsCL[Default]}: ${idsCL[Green]}`IDS_NUMBER_FORMAT ${INPUTV} 2`'volts"
 		echo -e "${idsCL[White]}Inverter Input Amps      ${idsCL[Default]}: ${idsCL[Green]}`IDS_NUMBER_FORMAT ${INPUTA} 2`'amps"
 		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 Volts    ${idsCL[Default]}: ${idsCL[Green]}`IDS_NUMBER_FORMAT ${OUTPUTV} 2`'volts / ${OUTPUTV2}'volts"
+		echo -e "${idsCL[White]}Inverter Output Amps     ${idsCL[Default]}: ${idsCL[Green]}`IDS_NUMBER_FORMAT ${OUTPUTA} 2`'amps / ${OUTPUTA2}'amps"
 		echo -e "${idsCL[White]}Inverter Output Watts    ${idsCL[Default]}: ${idsCL[Green]}`IDS_NUMBER_FORMAT ${OUTPUTW} 2`'watts"
 		echo
-		echo -e "${idsCL[White]}Battery Voltage          ${idsCL[Default]}: ${idsCL[Green]}${BATTV}'volts ~ ${BATTLIFE}%${idsCL[Default]}"
+		echo -e "${idsCL[White]}Battery Voltage          ${idsCL[Default]}: ${idsCL[Green]}`IDS_NUMBER_FORMAT ${BATTV} 2`$'volts ~ `IDS_NUMBER_FORMAT ${BATTLIFE} 2`%${idsCL[Default]}"
 		echo -e "${idsCL[White]}Battery Amps Chg/DChg    ${idsCL[Default]}: ${BATTA_disp}${idsCL[Default]}"
 		echo
 
@@ -594,10 +594,10 @@ CHECKPOWER(){
 			APCPDU_WATT=`echo "scale=2; ${APCPDU_AMP}*${SVRRM_VOLT}" | bc`
 		# fi
 
-		echo -e "${idsCL[White]}ServerRack Amps          ${idsCL[Default]}: ${idsCL[Green]}${APCPDU_AMP}'amps${idsCL[Default]}"
+		echo -e "${idsCL[White]}ServerRack Amps          ${idsCL[Default]}: ${idsCL[Green]}`IDS_NUMBER_FORMAT ${APCPDU_AMP} 2`'amps${idsCL[Default]}"
 		if [ "${avgdays}" != "" ]; then
 			average=$(AVERAGEPOWER ${PW_POWERSENSOR_ID['server-rack']} ${avgdays})
-			average_disp="${idsCL[LightYellow]}	`printf "%'.2f\n" ${average}`'watts"
+			average_disp="${idsCL[LightYellow]}	`IDS_NUMBER_FORMAT ${average}`'watts"
 		else
 			average_disp=""
 		fi
@@ -613,10 +613,10 @@ CHECKPOWER(){
 			VOLT_DROP=`echo "scale=1; ${OUTPUTV2}-${SVRRM_VOLT}" | bc`
 		fi
 
-		echo -e "${idsCL[White]}NetworkRack Amps         ${idsCL[Default]}: ${idsCL[Green]}${NETRK_AMP}'amps ~ estimate${idsCL[Default]}"
+		echo -e "${idsCL[White]}NetworkRack Amps         ${idsCL[Default]}: ${idsCL[Green]}`IDS_NUMBER_FORMAT ${NETRK_AMP}`'amps ~ estimate${idsCL[Default]}"
 		if [ "${avgdays}" != "" ]; then
 			average=$(AVERAGEPOWER ${PW_POWERSENSOR_ID['network-rack']} ${avgdays})
-			average_disp="${idsCL[LightYellow]} 	`printf "%'.2f\n" ${average}`'watts"
+			average_disp="${idsCL[LightYellow]} 	`IDS_NUMBER_FORMAT ${average}`'watts"
 		else
 			average_disp=""
 		fi
@@ -628,7 +628,7 @@ 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_disp="${idsCL[LightYellow]}		`printf "%'.2f\n" ${average}`'watts"
+			average_disp="${idsCL[LightYellow]}		`IDS_NUMBER_FORMAT ${average}`'watts"
 		else
 			average_disp=""
 		fi
@@ -674,20 +674,20 @@ CHECKPOWER(){
 		
 		fi
 	
-		echo -e "${idsCL[White]}UPS Voltage In           ${idsCL[Default]}: ${idsCL[Green]}${OFFSITE_VOLTIN}'volts${idsCL[Default]}"
-		echo -e "${idsCL[White]}UPS Voltage Out          ${idsCL[Default]}: ${idsCL[Green]}${OFFSITE_VOLTOUT}'volts${idsCL[Default]}"
+		echo -e "${idsCL[White]}UPS Voltage In           ${idsCL[Default]}: ${idsCL[Green]}`IDS_NUMBER_FORMAT ${OFFSITE_VOLTIN}`'volts${idsCL[Default]}"
+		echo -e "${idsCL[White]}UPS Voltage Out          ${idsCL[Default]}: ${idsCL[Green]}`IDS_NUMBER_FORMAT ${OFFSITE_VOLTOUT}`'volts${idsCL[Default]}"
 		echo
-		echo -e "${idsCL[White]}Total Amps               ${idsCL[Default]}: ${idsCL[Green]}${OFFSITE_AMPS}'amps ~ estimate${idsCL[Default]}"
+		echo -e "${idsCL[White]}Total Amps               ${idsCL[Default]}: ${idsCL[Green]}`IDS_NUMBER_FORMAT ${OFFSITE_AMPS}`'amps ~ estimate${idsCL[Default]}"
 		if [ "${avgdays}" != "" ]; then
 			average=$(AVERAGEPOWER ${PW_POWERSENSOR_ID['offsite-ups']} ${avgdays})
-			average_disp="${idsCL[LightYellow]}	`printf "%'.2f\n" ${average}`'watts"
+			average_disp="${idsCL[LightYellow]}	`IDS_NUMBER_FORMAT ${average}`'watts"
 		else
 			average_disp=""
 		fi
 		echo -e "${idsCL[White]}Total Wattage            ${idsCL[Default]}: ${idsCL[Green]}`IDS_NUMBER_FORMAT ${OFFSITE_WATTS} 2`'watts ~ estimate${average_disp}${idsCL[Default]}"
 		echo
-		echo -e "${idsCL[White]}Battery Capacity         ${idsCL[Default]}: ${idsCL[Green]}${OFFSITE_BATT_CAP}%${idsCL[Default]}"
-		echo -e "${idsCL[White]}Battery Runtime          ${idsCL[Default]}: ${idsCL[Green]}${OFFSITE_BATT_RUNTIME%.*}'Mins${idsCL[Default]}"
+		echo -e "${idsCL[White]}Battery Capacity         ${idsCL[Default]}: ${idsCL[Green]}`IDS_NUMBER_FORMAT ${OFFSITE_BATT_CAP}`%${idsCL[Default]}"
+		echo -e "${idsCL[White]}Battery Runtime          ${idsCL[Default]}: ${idsCL[Green]}${OFFSITE_BATT_RUNTIME}'Mins${idsCL[Default]}"
 		echo
 		# echo -e "${idsCL[LightCyan]}Current Fan Speed        ${idsCL[Default]}: ${idsCL[Green]}${FanSpeed}%${idsCL[Default]}"
 		# echo
@@ -717,11 +717,10 @@ CHECKPOWER(){
 					done				
 					HOST_WATTS=$(snmpwalk -t 1 -r 0 -v 1 -c public ${PW_HOST_IDRACS[${SENSOR}]} iso.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.${s} | sed 's/.*: //')
 				# fi
-				[[ "${HOST_WATTS}" = *"Timeout"* ]] && HOST_WATTS_disp="${idsCL[LightRed]}Host Offline" || HOST_WATTS_disp="${idsCL[Green]}${HOST_WATTS}'watts"
+				[[ "${HOST_WATTS}" = *"Timeout"* ]] && HOST_WATTS_disp="${idsCL[LightRed]}Host Offline" || HOST_WATTS_disp="${idsCL[Green]}`IDS_NUMBER_FORMAT ${HOST_WATTS}`'watts"
 				if [ "${avgdays}" != "" ]; then
 					average=$(AVERAGEPOWER ${PW_POWERSENSOR_ID[${SENSOR}]} ${avgdays})
-					[[ "${average}" == *"."* ]] && [[ "${average}" != *".0"* ]] && average=`printf "%'.2f\n" ${average}` || average=`printf "%'.0f\n" ${average}`
-					average_disp="${idsCL[LightYellow]}			${average}'watts"
+					average_disp="${idsCL[LightYellow]}			`IDS_NUMBER_FORMAT ${average}`'watts"
 				else
 					average_disp=""
 				fi