diff --git a/koji-setup/koji-add-builder.sh b/koji-setup/koji-add-builder.sh
index 67aa2eb..c328382 100644
--- a/koji-setup/koji-add-builder.sh
+++ b/koji-setup/koji-add-builder.sh
@@ -75,6 +75,8 @@ if [ $KOJI_BUILD_FQDN eq $KOJI_HUB_FQDN ] ; then
     fi
     koji-deploy-builder.sh $DEBUG
 else
+    # deploy to specified server
+
     ## On the HUB
     # check if nfs has been installed on the hub (only need to install once) 
     if [ -z $(dnf list installed | grep nfs-server) ] ; then
@@ -84,7 +86,7 @@ else
         koji-deploy-nfs-server.sh $DEBUG
     fi
 
-    # add build server to nfs exports line
+    # add build server to nfs exports line for /mnt/koji
     sed '/^\/mnt\/koji/ s/$/ $KOJI_BUILD_FQDN(ro,no_root_squash)/' /etc/exports
 
     # Generate a certificate for the builder
diff --git a/koji-setup/koji-bootstrap-build.sh b/koji-setup/koji-bootstrap-build.sh
index 1caaa36..61453b9 100755
--- a/koji-setup/koji-bootstrap-build.sh
+++ b/koji-setup/koji-bootstrap-build.sh
@@ -17,7 +17,7 @@ for param in $1 $2 ; do
 done
 
 if [ $DEBUG ] ; then
-    set -x
+    set -xe
     SILENT=
     QUIET="-v"
 fi
diff --git a/koji-setup/koji-deploy-builder.sh b/koji-setup/koji-deploy-builder.sh
index c9e5ac1..8dd81fb 100755
--- a/koji-setup/koji-deploy-builder.sh
+++ b/koji-setup/koji-deploy-builder.sh
@@ -18,7 +18,7 @@ for param in $1 $2 ; do
 done
 
 if [ $DEBUG ] ; then
-    set -x
+    set -xe
     SILENT=
     QUIET="-v"
 fi
@@ -37,7 +37,7 @@ if [ -z $(dnf list installed | grep epel-release) ] ; then
 	dnf install -y epel-release $QUIET
 fi
 if [ -z $(dnf list installed | grep koji-builder) ] ; then
-	dnf install -y koji-builder
+	dnf install -y koji-builder $QUIET
 fi
 
 # Create mock folders and permissions
diff --git a/koji-setup/koji-gencert.sh b/koji-setup/koji-gencert.sh
index f469354..92d0128 100755
--- a/koji-setup/koji-gencert.sh
+++ b/koji-setup/koji-gencert.sh
@@ -20,7 +20,7 @@ for param in $3 ; do
 done
 
 if [ $DEBUG ] ; then
-    set -x
+    set -xe
     SILENT=
     QUIET="-v"
 fi