diff --git a/inc/power.inc.sh b/inc/power.inc.sh
index c8618afe..3a22dbae 100644
--- a/inc/power.inc.sh
+++ b/inc/power.inc.sh
@@ -92,7 +92,7 @@ CHECKPOWER(){
 		[ ${REPORT} -eq 0 ] && echo
 		[ ${REPORT} -eq 0 ] && DIVIDER . yellow ${PRI_WIDTH}
 		echo -en "${idsCL[Yellow]}Mainsite Power Information"
-		[ "${avgdays}" != "" ] && echo -e "				${idsCL[LightYellow]}${avgdays_disp}-Averages" || echo
+		[ "${avgdays}" != "" ] && echo -e "				--${idsCL[LightYellow]}${avgdays_disp}-Averages---" || echo
 		DIVIDER . yellow ${PRI_WIDTH}
 				
 		[ ${REPORT} -eq 0 ] && echo -en "${idsCL[Yellow]}Pulling data from 'Powerwall' ... "
diff --git a/inc/temp.inc.sh b/inc/temp.inc.sh
index 715fb83b..72898785 100644
--- a/inc/temp.inc.sh
+++ b/inc/temp.inc.sh
@@ -251,7 +251,7 @@ CHECKTEMPSENSOR(){
 		echo ${mqtt_message} | cut -d':' -f 6 | cut -d',' -f 1 | read temp_c
 		
 	elif [ "${PW_SENSOR_TYPE[${1}]}" == "lacrosse" ]; then
-		if ! INFO=$(curl -m 7 -s --get -d "deviceid=${PW_SENSOR_DEVICEID[${SENSOR}]}" -d "limit=1" -d "metric=1" -d "timezone=2" https://decent-destiny-704.appspot.com/laxservices/device_info.php) ; then TIMEOUT=1; fi
+		if ! INFO=$(curl -m 1 -s --get -d "deviceid=${PW_SENSOR_DEVICEID[${SENSOR}]}" -d "limit=1" -d "metric=1" -d "timezone=2" https://decent-destiny-704.appspot.com/laxservices/device_info.php) ; then TIMEOUT=1; fi
 		if [ "${INFO}" != "" ]; then
 			if [[ "${1}" = *"-Probe" ]]; then
 				temp_c=`IDS_NUMBER_FORMAT $(echo ${INFO} | jq -r '.device0 .obs[].probe_temp') 2 yes`
@@ -350,7 +350,6 @@ CHECKTEMPSENSOR(){
 			lmd="Normal  "
 		fi
 		echo -en "${lclr}${lmd}${spct}${temp_f_disp}${GAUGESH}"
-		[ "${average}" != "" ] && echo -en " /${spca}${averagedisp}${GAUGESH}"
 		
 		# if [ "${7}" == "fans" ]; then
 # 			echo -en "${idsCL[Default]}${spc}[${idsCL[LightGreen]}${GL_LOW}${GAUGESH}${idsCL[Default]}/${idsCL[Green]}${ESXI_DEFAULT_EXHAUST_MIN}${GAUGESH}${idsCL[Default]}/${idsCL[LightYellow]}${GL_HIGH}${GAUGESH}${idsCL[Default]}]"
@@ -366,10 +365,11 @@ CHECKTEMPSENSOR(){
 			[ "${PW_SENSOR_TYPE[${1}]}" == "lacrosse" ] && [[ "${1}" != *"-ProbeXXX" ]] && echo -e " - $(echo ${INFO} | jq -r '.device0 .obs[].timestamp')" || echo
 		fi
 	elif [ ${TIMEOUT} -eq 1 ]; then
-		echo -e "${idsCL[Yellow]}Sensor Timeout${idsCL[Default]}"
+		echo -en "${idsCL[Yellow]}Sensor Timeout${idsCL[Default]}"
 	else
-		echo -e "${idsCL[Yellow]}Sensor Offline${idsCL[Default]}"
+		echo -en "${idsCL[Yellow]}Sensor Offline${idsCL[Default]}"
 	fi
+	[ "${average}" != "" ] && echo -en " /${spca}${averagedisp}${GAUGESH}"
 }
 AVERAGETEMP(){
 	temptotal=0