diff --git a/bash_aliases b/bash_aliases
index aa1dcd0..f0768c9 100644
--- a/bash_aliases
+++ b/bash_aliases
@@ -20,7 +20,7 @@ function stop () {
 
 function watch () {
 	if [ -n "$1" ]; then
-		sudo journalctl -u ${1} -f
+		sudo journalctl -u qn${1} -f
 	else
 		echo "usage: watch service_name"
 	fi
diff --git a/qnadmin b/qnadmin
index 138d947..dffd7ba 100755
--- a/qnadmin
+++ b/qnadmin
@@ -26,10 +26,10 @@ InstallMMDVMHosts () {
 		if [ $nmmdvm -eq 1 ]; then
 			sudo make ${1}installmmdvm
 		else
-			sudo make MODULE=$ammdvm[0] ${1}installmmdvm
-			sudo make MODULE=$ammdvm[1] ${1}installmmdvm
+			sudo make MODULE=${ammdvm[0]} ${1}installmmdvm
+			sudo make MODULE=${ammdvm[1]} ${1}installmmdvm
 			if [ $nmmdvm -eq 3 ]; then
-				sudo make MODULE=$advap[2] ${1}installmmdvm
+				sudo make MODULE=${advap[2]} ${1}installmmdvm
 			fi
 		fi
 	fi
@@ -50,10 +50,10 @@ InstallSystem () {
 		if [ $ndvap -eq 1 ]; then
 			sudo make ${1}installdvap
 		else
-			sudo make MODULE=$advap[0] ${1}installdvap
-			sudo make MODULE=$advap[1] ${1}installdvap
+			sudo make MODULE=${advap[0]} ${1}installdvap
+			sudo make MODULE=${advap[1]} ${1}installdvap
 			if [ $ndvap -eq 3 ]; then
-				sudo make MODULE=$advap[2] ${1}installdvap
+				sudo make MODULE=${advap[2]} ${1}installdvap
 			fi
 		fi
 	fi
@@ -64,10 +64,10 @@ InstallSystem () {
 		if [ $ndvrptr -eq 1 ]; then
 			sudo make ${1}installdvrptr
 		else
-			sudo make MODULE=$advrptr[0] ${1}installdvrptr
-			sudo make MODULE=$advrptr[1] ${1}installdvrptr
+			sudo make MODULE=${advrptr[0]} ${1}installdvrptr
+			sudo make MODULE=${advrptr[1]} ${1}installdvrptr
 			if [ $ndvrptr -eq 3 ]; then
-				sudo make MODULE=$advrptr[2] ${1}installdvrptr
+				sudo make MODULE=${advrptr[2]} ${1}installdvrptr
 			fi
 		fi
 	fi
@@ -78,10 +78,10 @@ InstallSystem () {
 		if [ $nitap -eq 1 ]; then
 			sudo make ${1}installitap
 		else
-			sudo make MODULE=$aitap[0] ${1}installitap
-			sudo make MODULE=$aitap[1] ${1}installitap
+			sudo make MODULE=${aitap[0]} ${1}installitap
+			sudo make MODULE=${aitap[1]} ${1}installitap
 			if [ $nitap -eq 3 ]; then
-				sudo make MODULE=$aitap[2] ${1}installitap
+				sudo make MODULE=${aitap[2]} ${1}installitap
 			fi
 		fi
 	fi
@@ -92,10 +92,10 @@ InstallSystem () {
 		if [ $nmmdvm -eq 1 ]; then
 			sudo make ${1}installrelay
 		else
-			sudo make MODULE=$ammdvm[0] ${1}installrelay
-			sudo make MODULE=$ammdvm[1] ${1}installrelay
+			sudo make MODULE=${ammdvm[0]} ${1}installrelay
+			sudo make MODULE=${ammdvm[1]} ${1}installrelay
 			if [ $nmmdvm -eq 3 ]; then
-				sudo make MODULE=$advap[2] ${1}installrelay
+				sudo make MODULE=${advap[2]} ${1}installrelay
 			fi
 		fi
 	fi
@@ -106,10 +106,10 @@ InstallSystem () {
 		if [ $nmodem -eq 1 ]; then
 			sudo make ${1}installmodem
 		else
-			sudo make MODULE=$amodem[0] ${1}installmodem
-			sudo make MODULE=$amodem[1] ${1}installmodem
+			sudo make MODULE=${amodem[0]} ${1}installmodem
+			sudo make MODULE=${amodem[1]} ${1}installmodem
 			if [ $nmmdvm -eq 3 ]; then
-				sudo make MODULE=$amodem[2] ${1}installmodem
+				sudo make MODULE=${amodem[2]} ${1}installmodem
 			fi
 		fi
 	fi