diff --git a/nodemgmt-scripts.sh b/nodemgmt-scripts.sh
index 556bb58c..b61c1e9f 100755
--- a/nodemgmt-scripts.sh
+++ b/nodemgmt-scripts.sh
@@ -167,6 +167,8 @@ STATUS(){
 										SERVICE gitea stop q
 										SET-PERMISSIONS gitea q
 										SERVICE gitea start q
+									fi
+									if [ "$(${NCMD} systemctl is-active ${srvc})" != "active" ]; then
 										if [ "${ST_ACTION}" != "check" ]; then
 											echo -e "${idsCL[Red]}Not Running - could not fix${idsCL[Default]}"
 										fi
@@ -1287,8 +1289,11 @@ SERVICE(){
 		echo -e "${idsCL[LightGreen]}-------------------------------------------${idsCL[Default]}"
 	fi
 	
-	echo -en "${idsCL[LightYellow]}Waiting for nginx config replication across the nodes... ${idsCL[Default]}"
+
 	if [ "${1}" = "nginx" ]; then
+		if [ "${3}" != "q" ]; then
+			echo -en "${idsCL[LightYellow]}Waiting for nginx config replication across the nodes... ${idsCL[Default]}"
+		fi
 		if [ "${2}" = "restart" ] || [ "${2}" = "reload" ]; then
 			PH_CMD="ssh root@${WEB_HOSTS[0]}"
 			${PH_CMD} rm -f /etc/nginx/test.repl
@@ -1306,8 +1311,10 @@ SERVICE(){
 			done
 		fi
 	fi
-	echo -e "${idsCL[Green]}Completed${idsCL[Default]}"
-	echo
+	if [ "${3}" != "q" ]; then
+		echo -e "${idsCL[Green]}Completed${idsCL[Default]}"
+		echo
+	fi
 	
 	for NTYPE in "${NODE_TYPES[@]}"; do
 		var1=${NTYPE}SERVICES_CHECK
@@ -1343,7 +1350,7 @@ SERVICE(){
 								echo -e "${idsCL[Red]}ERROR${idsCL[Default]}"
 							fi
 						fi
-					else
+					elif [ "${3}" != "q" ]; then
 						echo -e "${idsCL[Red]}Node is Down${idsCL[Default]}"
 					fi
 				# fi