diff --git a/defaults.inc b/defaults.inc
index b0e4aed6..7ad93f24 100755
--- a/defaults.inc
+++ b/defaults.inc
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-VERS='2.6.33-02142024'
+VERS='2.6.34-02142024'
 
 noheader=' update service dailytemp confsync -r -report '
 
diff --git a/inc/power.inc.bak.sh b/inc/power.inc.bak.sh
index ccb7894b..59b9b47b 100644
--- a/inc/power.inc.bak.sh
+++ b/inc/power.inc.bak.sh
@@ -26,7 +26,7 @@ AVERAGEPOWER(){
 				total_watt=$(bc <<< "scale=2; ${total_watt}+${watt}")
 				((logsfound_watt++))
 			fi
-		done  < <(${mysql_conn} -se "USE servermonitor; SELECT date,amp,watt from power_data WHERE sensorid=${sensorid} AND date BETWEEN DATE_SUB(DATE(NOW()), INTERVAL ${interval}) AND NOW() ORDER BY id DESC;")
+		done  < <(${mysql_conn} -se "USE servermonitor; SELECT date,amp,watt from power_data WHERE sensorid=${sensorid} AND date >= DATE_SUB(NOW(), INTERVAL ${interval}) ORDER BY id DESC;")
 		if [ "${logsfound_watt}" != "0" ]; then
 			average_amp=$(bc <<< "scale=2; ${total_amp}/${logsfound_amp}")
 			average_watt=$(bc <<< "scale=2; ${total_watt}/${logsfound_watt}")
@@ -44,7 +44,7 @@ AVERAGEPOWER(){
 				total=$(bc <<< "scale=2; ${total}+${!ptype}")
 				((logsfound++))
 			fi
-		done  < <(${mysql_conn} -se "USE servermonitor; SELECT date,${ptype} from power_data WHERE sensorid=${sensorid} AND date BETWEEN DATE_SUB(DATE(NOW()), INTERVAL ${interval}) AND NOW() ORDER BY id DESC;")
+		done  < <(${mysql_conn} -se "USE servermonitor; SELECT date,${ptype} from power_data WHERE sensorid=${sensorid} AND date >= DATE_SUB(NOW(), INTERVAL ${interval}) ORDER BY id DESC;")
 		[ "${logsfound}" != "0" ] && average=$(bc <<< "scale=2; ${total}/${logsfound}") || average=0
 		echo ${average}
 	fi
diff --git a/inc/power.inc.sh b/inc/power.inc.sh
index 74973f39..b0170bad 100644
--- a/inc/power.inc.sh
+++ b/inc/power.inc.sh
@@ -26,7 +26,7 @@ AVERAGEPOWER(){
 				total_watt=$(bc <<< "scale=2; ${total_watt}+${watt}")
 				((logsfound_watt++))
 			fi
-		done  < <(${mysql_conn} -se "USE servermonitor; SELECT date,amp,watt from power_data WHERE sensorid=${sensorid} AND date BETWEEN DATE_SUB(DATE(NOW()), INTERVAL ${interval}) AND NOW() ORDER BY id DESC;")
+		done  < <(${mysql_conn} -se "USE servermonitor; SELECT date,amp,watt from power_data WHERE sensorid=${sensorid} AND date >= DATE_SUB(NOW(), INTERVAL ${interval}) ORDER BY id DESC;")
 		if [ "${logsfound_watt}" != "0" ]; then
 			average_amp=$(bc <<< "scale=2; ${total_amp}/${logsfound_amp}")
 			average_watt=$(bc <<< "scale=2; ${total_watt}/${logsfound_watt}")
@@ -44,7 +44,7 @@ AVERAGEPOWER(){
 				total=$(bc <<< "scale=2; ${total}+${!ptype}")
 				((logsfound++))
 			fi
-		done  < <(${mysql_conn} -se "USE servermonitor; SELECT date,${ptype} from power_data WHERE sensorid=${sensorid} AND date BETWEEN DATE_SUB(DATE(NOW()), INTERVAL ${interval}) AND NOW() ORDER BY id DESC;")
+		done  < <(${mysql_conn} -se "USE servermonitor; SELECT date,${ptype} from power_data WHERE sensorid=${sensorid} AND date >= DATE_SUB(NOW(), INTERVAL ${interval}) ORDER BY id DESC;")
 		[ "${logsfound}" != "0" ] && average=$(bc <<< "scale=2; ${total}/${logsfound}") || average=0
 		echo ${average}
 	fi
diff --git a/powerwall.sh b/powerwall.sh
index b78e803e..430ae8ae 100755
--- a/powerwall.sh
+++ b/powerwall.sh
@@ -823,36 +823,6 @@ DOWNLIST(){
 }
 
 
-# TEST(){
-# 	start=`date +%s`
-# 	temptotal=0
-# 	daysback=${1}
-# 	logsfound=0;
-# 	while IFS=$'\t' read date sensorid temp hum ;do
-# 		# echo date:$date sensorid:$sensorid temp:$temp hum:$hum
-# 		temptotal=$(bc <<< "scale=2; ${temptotal}+${temp}")
-# 		# echo "- ${temptotal} + ${temp}"
-# 		((logsfound++))
-#
-# 	done  < <(${mysql_conn} -se "USE servermonitor; SELECT date,sensorid,temp,hum from sensor_data WHERE sensorid=2 AND date BETWEEN
-#         DATE_SUB(DATE(NOW()), INTERVAL ${daysback} DAY) AND NOW() ORDER BY id DESC;")
-#
-# 	average=$(bc <<< "scale=2; ${temptotal}/${logsfound}")
-#
-# 	echo "Logs found: ${logsfound}"
-# 	echo "Average: ${average}'F"
-# 	echo
-#
-# 	# QRY="INSERT INTO inv_jsonstats (\`date\`, \`data\`) VALUES ('$(date +'%Y-%m-%d %H:%M:%S')','${INVSTATSINFO}')"
-# 	# ${mysql_conn} -e "USE servermonitor; ${QRY}"
-#
-# 	end=`date +%s`
-# 	runtime=$((end-start))
-# 	echo "runtime: ${runtime}s"
-# 	echo
-# }
-
-
 
 #########################################################
 if [[ "${1}" != *"_service" ]] && [[ "${noheader}" != *" ${1} "* ]] && [[ "${noheader}" != *" ${2} "* ]] && [[ "${noheader}" != *" ${3} "* ]] && [[ "${noheader}" != *" ${4} "* ]] && [[ "${noheader}" != *" ${5} "* ]]; then