diff --git a/defaults.inc b/defaults.inc
index 545cf5c4..96a55ced 100755
--- a/defaults.inc
+++ b/defaults.inc
@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-VERS='5.1.0a-12062023'
+VERS='5.1.0b-12062023'
 NM_BETA=true
 
 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 '
diff --git a/inc/status.inc b/inc/status.inc
index ce9e35b8..778e98a8 100755
--- a/inc/status.inc
+++ b/inc/status.inc
@@ -550,30 +550,27 @@ STATUS_NODE(){
 									[ "${srvc}" == "pdnsadmin" ] && ${NCMD} systemctl restart ${srvc} &
 									
 								elif [ ! -f ${NM_TMPFOLDER}/${nip}~${srvc}.disable ]; then
-									errtime=$(expr $(date +%s) - $(stat -c %Y ${NM_TMPFOLDER}/${nip}~${srvc}.down))
-									if [ ${errtime} -gt ${NM_RENOTIFY_TIMEOUT} ]; then
+									[ "${ST_ACTION}" != "check" ] && echo -en "${idsCL[Red]}Not running for $(SHOW_TIME ${toterrtime})"
+									if ([ -f ${NM_TMPFOLDER}/${nip}~${srvc}.sent ] && [ $(expr $(date +%s) - $(stat -c %Y ${NM_TMPFOLDER}/${nip}~${srvc}.sent)) -gt ${NM_RENOTIFY_TIMEOUT} ]) || ([ ! -f ${NM_TMPFOLDER}/${nip}~${srvc}.sent ] && [ ${errtime} -gt 60 ]); then
 										[ ! -f ${NM_TMPFOLDER}/${nip}~${srvc}.errtime ] && mv ${NM_TMPFOLDER}/${nip}~${srvc}.down ${NM_TMPFOLDER}/${nip}~${srvc}.errtime
-										toterrtime=$(expr $(date +%s) - $(stat -c %Y ${NM_TMPFOLDER}/${nip}~${srvc}.errtime))
 										touch ${NM_TMPFOLDER}/${nip}~${srvc}.down
 										SENDNOTICE "${NM_HOSTNAMES[${nip}]}[${nip}]" "${NM_SERVICE_DESC[${srvc}]} is down" 1
-									
-									elif [ ${errtime} -gt 60 ] && [ ${errtime} -lt 180 ] && [ ! -f ${NM_TMPFOLDER}/${nip}~${srvc}.errtime ]; then
-										SENDNOTICE "${NM_HOSTNAMES[${nip}]}[${nip}]" "${NM_SERVICE_DESC[${srvc}]} is down" 1
-
+										touch ${NM_TMPFOLDER}/${nip}~${srvc}.sent
 									fi
-									[ "${ST_ACTION}" != "check" ] && echo -en "${idsCL[Red]}Not running for $(SHOW_TIME ${toterrtime})"
 								fi
 							else
 								[ "${ST_ACTION}" != "check" ] && echo -en "${idsCL[LightGreen]}Running"
 								if [ -f ${NM_TMPFOLDER}/${nip}~${srvc}.down ]; then
-									[ -f ${NM_TMPFOLDER}/${nip}~${srvc}.errtime ] && toterrtime=$(expr $(date +%s) - $(stat -c %Y ${NM_TMPFOLDER}/${nip}~${srvc}.errtime)) || toterrtime=$(expr $(date +%s) - $(stat -c %Y ${NM_TMPFOLDER}/${nip}~${srvc}.down))
-									SENDNOTICE "${NM_HOSTNAMES[${nip}]}[${nip}]" "${NM_SERVICE_DESC[${srvc}]} is back UP! It was down for $(SHOW_TIME ${toterrtime})"
-									echo "$(date +%Y-%m-%d-%H-%M-%S) - ${nip} - ${NM_HOSTNAMES[${nip}]}[${nip}] - ${NM_SERVICE_DESC[${srvc}]} is back up, it was down for $(SHOW_TIME ${toterrtime})" >> ${NM_LOGFILE}
-
-									rm -f ${NM_TMPFOLDER}/${nip}~${srvc}.*
+									if [ -f ${NM_TMPFOLDER}/${nip}~${srvc}.sent ]; then
+										[ -f ${NM_TMPFOLDER}/${nip}~${srvc}.errtime ] && toterrtime=$(expr $(date +%s) - $(stat -c %Y ${NM_TMPFOLDER}/${nip}~${srvc}.errtime)) || toterrtime=$(expr $(date +%s) - $(stat -c %Y ${NM_TMPFOLDER}/${nip}~${srvc}.down))
+										SENDNOTICE "${NM_HOSTNAMES[${nip}]}[${nip}]" "${NM_SERVICE_DESC[${srvc}]} is back UP! It was down for $(SHOW_TIME ${toterrtime})"
+										echo "$(date +%Y-%m-%d-%H-%M-%S) - ${nip} - ${NM_HOSTNAMES[${nip}]}[${nip}] - ${NM_SERVICE_DESC[${srvc}]} is back up, it was down for $(SHOW_TIME ${toterrtime})" >> ${NM_LOGFILE}
+									fi
+									# rm -f ${NM_TMPFOLDER}/${nip}~${srvc}.*
 
 								fi
-								[ "${srvc}" == "gitea" ] || [ "${srvc}" == "headscale" ] && rm -f ${NM_FOLDER}/*~${srvc}.*
+								[[ "${NM_SINGLESRVR_SERVICES[${NODETYPE}]}" = *"${srvc}"* ]] && rm -f ${NM_FOLDER}/*~${srvc}.* || rm -f ${NM_TMPFOLDER}/${nip}~${srvc}.*
+								# [ "${srvc}" == "gitea" ] || [ "${srvc}" == "headscale" ] && rm -f ${NM_FOLDER}/*~${srvc}.*
 							fi
 							[ "${mysqlgo}" = "true" ] && unset mysqlgo
 							[ "${SSCHK}" == "primary" ] && echo -e "${idsCL[LightCyan]} - Primary Node${idsCL[Default]}" || echo -e "${idsCL[Default]}"
@@ -666,7 +663,8 @@ STATUS_NODE(){
 								if [ "${ST_ACTION}" != "check" ]; then
 									echo -en "${idsCL[LightGreen]}Running"
 								fi
-								rm -f ${NM_TMPFOLDER}/${nip}~${docker}.*
+								# if [ "${docker}" == "authelia" ] || [ "${docker}" == "vaultwarden" ] || [ "${docker}" == "heimdall" ]; then
+								[[ "${NM_SINGLESRVR_DOCKERS[${NODETYPE}]}" = *"${docker}"* ]] && rm -f ${NM_FOLDER}/*~{docker}.* || rm -f ${NM_TMPFOLDER}/${nip}~${docker}.*
 							fi
 							[ "${SDCHK}" == "primary" ] && echo -e "${idsCL[LightCyan]} - Primary Node${idsCL[Default]}" || echo -e "${idsCL[Default]}"
 						else