diff --git a/powerwall.sh b/powerwall.sh
index 39664163..fdb9de99 100755
--- a/powerwall.sh
+++ b/powerwall.sh
@@ -19,7 +19,7 @@ CHECKTEMP(){
 	cw=25;
 	echo
 	# echo -e "${idsCL[Yellow]}Sensor Temperature(s)                            ${idsCL[Green]}normal${idsCL[Default]} /${idsCL[Yellow]}warning${idsCL[Default]}/ ${idsCL[Red]}critical${idsCL[Default]}"
-	echo -e "${idsCL[Cyan]}Sensor Temperature(s)                 Current / 3DayAVG    ${idsCL[Green]}normal${idsCL[Default]} /${idsCL[Yellow]}warning${idsCL[Default]}/ ${idsCL[Red]}critical${idsCL[Default]}"
+	echo -e "${idsCL[Cyan]}Sensor Temperature(s)                 Current / 3DayAVG    ${idsCL[Yellow]}warning${idsCL[Default]}/ ${idsCL[Red]}critical${idsCL[Default]}"
 	DIVIDER . yellow 90
 		
 	for SENSOR in ${PW_SENSOR_ORD[@]}; do
@@ -41,7 +41,7 @@ CHECKTEMP(){
 							temp_c=$(echo ${sensordata} | cut -d'p' -f2 | awk '/ / {print $2}' | sed -e 's/C//g');		temp_c=${temp_c/ /}
 							temp_warn=$(echo ${sensordata} | cut -d'p' -f2 | awk '/ / {print $7}' | sed -e 's/C//g');	temp_warn=${temp_warn/ /}
 							temp_crit=$(echo ${sensordata} | cut -d'p' -f2 | awk '/ / {print $4}' | sed -e 's/C//g');	temp_crit=${temp_crit/ /}
-							reading=$(CHECKTEMPSENSOR ${SENSOR} ${temp_c} ${temp_warn} ${temp_crit})
+							reading=$(CHECKTEMPSENSOR ${SENSOR} ${temp_c} ${temp_warn} ${temp_crit} ${vSENSOR// /_})
 							c=0; spc=''; spc1=`expr ${cw} - ${#vSENSOR} - 1`; until [ $c = ${spc1} ]; do spc="${spc} "; c=`expr $c + 1`; done
 							echo -e "${idsCL[LightCyan]} ${vSENSOR}${spc}${idsCL[Default]}: ${reading}"
 						
@@ -76,7 +76,7 @@ CHECKTEMP(){
 CHECKTEMPSENSOR(){
 	echo ${PW_TEMP_THRESHOLDS[${1}]} | cut -d',' -f 1 | read temp_warn
 	echo ${PW_TEMP_THRESHOLDS[${1}]} | cut -d',' -f 2 | read temp_crit
-	[ "${PW_SENSOR_TYPE[${1}]}" != "esxi" ] && average=$(AVERAGETEMP ${PW_SENSOR_ID[${1}]} 3) || average=${2}
+	[ "${PW_SENSOR_TYPE[${1}]}" != "esxi" ] && average=$(AVERAGETEMP ${PW_SENSOR_ID[${1}]} 3) || average=$(AVERAGETEMP ${PW_SENSOR_ID[${1}]} 3 ${5})
 	
 	if [ "${PW_SENSOR_TYPE[${1}]}" == "mqtt" ]; then
 		mqtt_message=`${mqtt_conn} -t tele/${1}/SENSOR -C 1`
@@ -126,7 +126,7 @@ CHECKTEMPSENSOR(){
 		c=0; spc=''; spc1=`expr 8 - ${#tmp}`; until [ $c = ${spc1} ]; do spc="${spc} "; c=`expr $c + 1`; done
 		[ ${#temp_warn} == 2 ] && spcw='  ' || spcw=' '
 		[ ${#temp_crit} == 2 ] && spcc='  ' || spcc=' '
-		echo -e "${spc}[ ${idsCL[Green]}<===${idsCL[Default]} /${spcw}${idsCL[Yellow]}${temp_warn}'F${idsCL[Default]} /${spcc}${idsCL[Red]}${temp_crit}'F=>${idsCL[Default]} ]"
+		echo -e "${spc}[${spcw}${idsCL[Yellow]}${temp_warn}'F${idsCL[Default]} /${spcc}${idsCL[Red]}${temp_crit}'F=>${idsCL[Default]} ]"
 	fi
 }
 AVERAGETEMP(){