diff --git a/defaults.inc b/defaults.inc
index 80e96e78..7c2aac4f 100755
--- a/defaults.inc
+++ b/defaults.inc
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-VERS='5.3.26b-02282025'
+VERS='5.4.1a-03102025'
 NM_BETA=false
 
 noheader=' service status-check nightlyrephp7.3-fpm,new backup report check checkcerts gitea update-nodes copynpmcerts singleservercheck update-dyndns backup-offsitepfsense gui nightlyreview update log betacheck offsite-staticroute-fix '
diff --git a/inc/services.inc b/inc/services.inc
index dabf82f1..aa8b4138 100755
--- a/inc/services.inc
+++ b/inc/services.inc
@@ -11,57 +11,63 @@ SINGLE_SERVER_SERVICE_CHECK(){
 		
 	if [ ! -f ${NM_TMPFOLDER}/.skip ] && ([[ "$(declare -p ${1^^}_SINGLESRVR_SERVICES)" =~ "declare -a" ]] || [[ "$(declare -p ${1^^}_SINGLESRVR_DOCKERS)" =~ "declare -a" ]]); then	
 		if [[ $(ip addr show $(ip route | awk '/default/ { print $5 }') | grep "inet" | awk '/inet/ {print $2}' | cut -d'/' -f1) == *${NM_SINGLESRVR_IP[${1^^}]}* ]]; then
-			if [ ! -f ${NM_TMPFOLDER}/.singleserver.${1^^}.primary ] || [ $(expr $(date +%s) - $(stat -c %Y ${NM_TMPFOLDER}/.singleserver.${1^^}.primary)) -ge 300 ]; then
-				if [ ! -f ${NM_TMPFOLDER}/.singleserver.${1^^}.primary ]; then
-					touch ${NM_TMPFOLDER}/.singleserver.${1^^}.primary
+			# if [ ! -f ${NM_TMPFOLDER}/.singleserver.${1^^}.primary ] || [ $(expr $(date +%s) - $(stat -c %Y ${NM_TMPFOLDER}/.singleserver.${1^^}.primary)) -ge 300 ]; then
+			# 	if [ ! -f ${NM_TMPFOLDER}/.singleserver.${1^^}.primary ]; then
+					[ ! -f ${NM_TMPFOLDER}/.singleserver.${1^^}.primary ] && touch ${NM_TMPFOLDER}/.singleserver.${1^^}.primary
 					SENDNOTICE "'${NM_NODETYPES[${1^^}]}' Node Switch" "Starting SingleServer for '${NM_NODETYPES[${1^^}]}' on ${NM_HOSTNAMES[${RUN_NODE_IP}]} (${RUN_NODE_IP}), stopping on other Nodes"
 					echo "$(date +%Y-%m-%d-%H-%M-%S) - ${NM_HOSTNAMES[${RUN_NODE_IP}]} - Starting SingleServer for '${NM_NODETYPES[${1^^}]}' on ${NM_HOSTNAMES[${RUN_NODE_IP}]} (${RUN_NODE_IP}), stopping on the other Nodes ..." >> ${NM_LOGFILE}
 					for stc in "${!servicestocheck}"; do
 						[ "${stc}" = "pdnsadmin" ] && stc="pdnsadmin.service pdnsadmin.socket"
 						for nip in "${!hosts}"; do
 							if [[ "${RUN_NODE_IP}" != *"${nip}"* ]] && [ "$(CHECK_HOST ${nip})" != "false" ]; then
-								ssh -tq -o ConnectTimeout=3 -o ConnectionAttempts=1 root@${nip} /bin/systemctl stop ${stc} >/dev/null 2>&1
-								ssh -tq -o ConnectTimeout=3 -o ConnectionAttempts=1 root@${nip} rm -f ${NM_TMPFOLDER}/.singleserver.${1^^}.primary >/dev/null 2>&1
+								ssh -tq -o ConnectTimeout=3 -o ConnectionAttempts=1 root@${nip} 'systemctl is-active --quiet '${stc}' && /bin/systemctl stop '${stc} >/dev/null 2>&1
+								ssh -tq -o ConnectTimeout=3 -o ConnectionAttempts=1 root@${nip} '[ -f '${NM_TMPFOLDER}'/.singleserver.'${1^^}'.primary ] && rm -f '${NM_TMPFOLDER}'/.singleserver.'${1^^}'.primary' >/dev/null 2>&1
 							fi
 						done
 					done
 					for docker in "${!dockerstocheck}"; do
 						for nip in "${!hosts}"; do
 							if [[ "${RUN_NODE_IP}" != *"${nip}"* ]] && [ "$(CHECK_HOST ${nip})" != "false" ]; then
-								ssh -q -o ConnectTimeout=3 -o ConnectionAttempts=1 root@${nip} docker stop ${docker} >/dev/null 2>&1
-								[ "${docker}" == "authelia" ] && ssh -q -o ConnectTimeout=3 -o ConnectionAttempts=1 root@${nip} docker stop auth_redis >/dev/null 2>&1
+								ssh -q -o ConnectTimeout=3 -o ConnectionAttempts=1 root@${nip} '[ "$(docker ps -q -f name='${docker}')" ] && docker stop '${docker} >/dev/null 2>&1
+								[ "${docker}" == "authelia" ] && ssh -q -o ConnectTimeout=3 -o ConnectionAttempts=1 root@${nip} '[ "$(docker ps -q -f name=auth_redis)" ] && docker stop auth_redis' >/dev/null 2>&1
 							fi
 						done
 					done
 					sleep 20s
-				else
+				# else
 					touch ${NM_TMPFOLDER}/.singleserver.${1^^}.primary
-				fi
+				# fi
 				
 				for stc in "${!servicestocheck}"; do
-					[ "${stc}" = "pdnsadmin" ] && stc="pdnsadmin.service pdnsadmin.socket"
-					/bin/systemctl start ${stc} >/dev/null 2>&1
+					if [ ! systemctl is-active --quiet ${stc} ]; then
+						[ "${stc}" = "pdnsadmin" ] && stc="pdnsadmin.service pdnsadmin.socket"
+						/bin/systemctl start ${stc} >/dev/null 2>&1
+					fi
 				done
 				for docker in "${!dockerstocheck}"; do
-					[ "${docker}" == "authelia" ] && docker start auth_redis && sleep 2s >/dev/null 2>&1
-					docker start ${docker} >/dev/null 2>&1
+					if [ ! "$(docker ps -q -f name=${docker})" ]; then
+						[ "${docker}" == "authelia" ] && docker start auth_redis && sleep 2s >/dev/null 2>&1
+						docker start ${docker} >/dev/null 2>&1
+					fi
 				done
-				rm -f ${NM_TMPFOLDER}/.singleserver.${1^^}.secondary
+				[ -f ${NM_TMPFOLDER}/.singleserver.${1^^}.secondary ] && rm -f ${NM_TMPFOLDER}/.singleserver.${1^^}.secondary
 				echo "$(date +%Y-%m-%d-%H-%M-%S) - ${NM_HOSTNAMES[${RUN_NODE_IP}]} - ... Done" >> ${NM_LOGFILE}
-			fi
+			# fi
 
 		else
-			if [ -f ${NM_TMPFOLDER}/.singleserver.${1^^}.primary ] || [ ! -f ${NM_TMPFOLDER}/.singleserver.${1^^}.secondary ] || [ $(expr $(date +%s) - $(stat -c %Y ${NM_TMPFOLDER}/.singleserver.${1^^}.secondary)) -ge 300 ]; then
-				touch ${NM_TMPFOLDER}/.singleserver.${1^^}.secondary
+			# if [ -f ${NM_TMPFOLDER}/.singleserver.${1^^}.primary ] || [ ! -f ${NM_TMPFOLDER}/.singleserver.${1^^}.secondary ] || [ $(expr $(date +%s) - $(stat -c %Y ${NM_TMPFOLDER}/.singleserver.${1^^}.secondary)) -ge 300 ]; then
+				[ ! -f ${NM_TMPFOLDER}/.singleserver.${1^^}.secondary ] && touch ${NM_TMPFOLDER}/.singleserver.${1^^}.secondary
 				for stc in "${!servicestocheck}"; do
-					[ "${stc}" = "pdnsadmin" ] && stc="pdnsadmin.socket pdnsadmin.service"
-					/bin/systemctl stop ${stc} & >/dev/null 2>&1
+					if [ systemctl is-active --quiet ${stc} ]; then
+						[ "${stc}" = "pdnsadmin" ] && stc="pdnsadmin.socket pdnsadmin.service"
+						/bin/systemctl stop ${stc} & >/dev/null 2>&1
+					fi
 				done
 				for docker in "${!dockerstocheck}"; do
-					docker stop ${docker} & >/dev/null 2>&1
+					[ "$(docker ps -q -f name=${docker})" ] && docker stop ${docker} & >/dev/null 2>&1
 				done
 				[ -f ${NM_TMPFOLDER}/.singleserver.${1^^}.primary ] && rm -f ${NM_TMPFOLDER}/.singleserver.${1^^}.primary
-			fi
+			# fi
 		fi
 	
 		[ "${1^^}" == "WEB" ] && [ "$(systemctl is-active nginx)" != "active" ] && ${NM_SCRIPT} service web restart ${RUN_NODE_IP}