diff --git a/mirror-wrapper b/mirror-wrapper
index 904047c..f8ed6e0 100755
--- a/mirror-wrapper
+++ b/mirror-wrapper
@@ -4,12 +4,11 @@
 # Configuration.
 COMMAND="/opt/bin/mirror"
 DEPOSITORY="/data/depository"
-MIRRORING_USER="mirroring"
-SBOSRCARCH_USER="sbosrcarch"
-DEPOSITORY_GROUP="depository"
+MIRRORING_USER='SLACKWAREUKINT\mirroring'
+DEPOSITORY_GROUP='SLACKWAREUKINT\depository'
 LOGSDIR="/var/log/duplication/mirroring/$(printf "%(%Y/%m)T")"
 LOGFILE="$(printf "%(%Y%m%d-%H%M%S)T")-$$"
-MIN_LOGFILE_SIZE="650"		# Used to prevent unnecessary emails - only messages over this size are sent.
+MIN_LOGFILE_SIZE="845"		# Used to prevent unnecessary emails - only messages over this size are sent.
 # Where from/to to send emails.  Comment for no emailing.
 EMAIL_FROM="\"Server: ${HOSTNAME%%.*}\" <noreply@slackware.uk.net>"
 EMAIL_TO=("Systems' Administrator <sysadmin@slackware.uk>")
@@ -17,7 +16,7 @@ EMAIL_TO=("Systems' Administrator <sysadmin@slackware.uk>")
 # Functions
 notify() {
   [[ -n "$EMAIL_FROM" ]] && (( "${#EMAIL_TO[@]}" != 0 )) && {
-    printf "%s: %s\\n%s: %s\\n%s:\\n%s\\n" "Exit code" "$ERR" "Logfile" "$LOGSDIR/$LOGFILE.xz" "Output" "$(<"$LOGSDIR/$LOGFILE")" | mail -r "$EMAIL_FROM" -s "Mirroring $1" "${EMAIL_TO[@]}" >/dev/null 2>&1 || {
+    printf "%s: %s\\n%s: %s\\n%s:\\n%s\\n" "Exit code" "$ERR" "Logfile" "$LOGSDIR/$LOGFILE.xz" "Output" "$(cat "$LOGSDIR/$LOGFILE" | sed -re 's/^/  /g')" | mail -r "$EMAIL_FROM" -s "Mirroring $1" "${EMAIL_TO[@]}" >/dev/null 2>&1 || {
       printf "%s: %s\\n" "${0##*/}" "mail command failed" >&2
       return 1
     }
@@ -31,7 +30,8 @@ umask 027
 
 # Only run for the configured mirroring user.
 [[ "$(whoami)" != "$MIRRORING_USER" ]] && {
-  printf "%s: %s\\n" "${0##*/}" "must be run by the '$MIRRORING_USER' user - use su to run manually" >&2
+  printf "%s: %s\\n" "${0##*/}" "must be run by the '$MIRRORING_USER' user" >&2
+  printf "%s: %s: %s\\n" "${0##*/}" "to run manually:" "su '$MIRRORING_USER' $0 $@" >&2
   exit 1
 }
 
@@ -67,16 +67,28 @@ fi
 sudo /opt/sbin/drop-caches
 
 # Make sure there's no errant ownerships.
-WRONG_PERMS="$(find "$DEPOSITORY" \( \( \! -user "$MIRRORING_USER" -a \! -user "$SBOSRCARCH_USER" \) -o \( \! -group "$DEPOSITORY_GROUP" \) \) -a \! -path "$DEPOSITORY" -printf "%u:%g\t%P\n")"
-if [[ -n "$WRONG_PERMS" ]]; then
-  printf "%s\\n" "This sync has been aborted!" >"$LOGSDIR/$LOGFILE"
-  printf "%s\\n" "The following files in have errant permissions:" >>"$LOGSDIR/$LOGFILE"
-  printf "%s\\n" "$WRONG_PERMS" >>"$LOGSDIR/$LOGFILE"
+printf "%s: %s\\n" "INFO" "Scanning depository directory for correct ownerships/permissions" | tee "$LOGSDIR/$LOGFILE"
+GLOBIGNORE="$DEPOSITORY/sbosrcarch"
+WRONG="$(find "$DEPOSITORY/"* \( \
+    \( \( -type b -o -type c -o -type p -o -type s \) -a \! -path "$DEPOSITORY/slackware/slackware-3.0/disk1/live/dev/*" \) -o \
+    \( -type l -a \! -perm 777 \) -o \
+    \( -type d -a \! -perm 755 -a \! -perm 2755 \) -o \
+    \( -type f -a \! -perm 644 -a \! -perm  755 \) -o \
+    \( \! -user "$MIRRORING_USER" \) -o \
+    \( \! -group "$DEPOSITORY_GROUP" \) \
+    \) -a -printf "%u:%g\t%M\t%p\n")"
+if [[ -n "$WRONG" ]]; then
+  printf "%s: %s\\n" "ERROR" "This sync has been aborted!" | tee -a "$LOGSDIR/$LOGFILE"
+  printf "%s: %s\\n" "WARNING" "The following paths have erronious ownerships/permissions:" | tee -a "$LOGSDIR/$LOGFILE"
+  printf "%s\\n" "$WRONG" | sed -re 's/^/  /g' | tee -a "$LOGSDIR/$LOGFILE"
   ERR=-1
 else
+  printf "%s: %s\\n" "INFO" "No ownership/permission issues found" | tee -a "$LOGSDIR/$LOGFILE"
   # Do the mirroring work.
+  umask 022
   export MIRRORING_USER
-  sg "$DEPOSITORY_GROUP" -c "$COMMAND $@" >"$LOGSDIR/$LOGFILE" 2>&1
+  printf "%s: %s: %s\\n" "INFO" "Beginning sync command" "sg \"$DEPOSITORY_GROUP\" -c \"$COMMAND $@\"" | tee -a "$LOGSDIR/$LOGFILE"
+  sg "$DEPOSITORY_GROUP" -c "$COMMAND $@" 2>&1 | tee -a "$LOGSDIR/$LOGFILE"
   ERR="$?"
 fi
 
diff --git a/sbosrcarch-wrapper b/sbosrcarch-wrapper
index d4d749b..a168d7d 100755
--- a/sbosrcarch-wrapper
+++ b/sbosrcarch-wrapper
@@ -4,8 +4,8 @@
 # Configuration.
 COMMAND="/opt/bin/sbosrcarch"
 DEPOSITORY="/data/depository/sbosrcarch"
-SBOSRCARCH_USER="sbosrcarch"
-DEPOSITORY_GROUP="depository"
+SBOSRCARCH_USER='SLACKWAREUKINT\sbosrcarch'
+DEPOSITORY_GROUP='SLACKWAREUKINT\depository'
 LOGSDIR="/var/log/duplication/sbosrcarch/$(printf "%(%Y/%m)T")"
 LOGFILE="$(printf "%(%Y%m%d-%H%M%S)T")-$$"
 # Where from/to to send emails.  Comment for no emailing.
@@ -16,7 +16,7 @@ EMAIL_CC=("Urchlay <urchlay@slackware.uk>")
 # Functions
 notify() {
   [[ -n "$EMAIL_FROM" ]] && (( "${#EMAIL_TO[@]}" != 0 )) && {
-    printf "%s: %s\\n%s: %s\\n%s:\\n%s\\n" "Exit code" "$ERR" "Logfile" "$LOGSDIR/$LOGFILE.xz" "Output" "$(<"$LOGSDIR/$LOGFILE")" | mail -r "$EMAIL_FROM" -s "SboSrcArch $1" "$(for i in $(seq -s ' ' 0 $(( ${#EMAIL_CC[@]} -1 ))); do echo ${EMAIL_CC[$i]:+-c "${EMAIL_CC[$i]}"}; done)" "${EMAIL_TO[@]}" >/dev/null 2>&1 || {
+    printf "%s: %s\\n%s: %s\\n%s:\\n%s\\n" "Exit code" "$ERR" "Logfile" "$LOGSDIR/$LOGFILE.xz" "Output" "$(cat "$LOGSDIR/$LOGFILE" | sed -re 's/^/  /g')" | mail -r "$EMAIL_FROM" -s "SboSrcArch $1" "$(for i in $(seq -s ' ' 0 $(( ${#EMAIL_CC[@]} -1 ))); do echo ${EMAIL_CC[$i]:+-c "${EMAIL_CC[$i]}"}; done)" "${EMAIL_TO[@]}" >/dev/null 2>&1 || {
       printf "%s: %s\\n" "${0##*/}" "mail command failed" >&2
       return 1
     }
@@ -30,7 +30,8 @@ umask 027
 
 # Only run for the configured sbosrcarch user.
 [[ "$(whoami)" != "$SBOSRCARCH_USER" ]] && {
-  printf "%s: %s\\n" "${0##*/}" "must be run by the '$SBOSRCARCH_USER' user - use su to run manually" >&2
+  printf "%s: %s\\n" "${0##*/}" "must be run by the '$SBOSRCARCH_USER' user" >&2
+  printf "%s: %s: %s\\n" "${0##*/}" "to run manually:" "su '$SBOSRCARCH_USER' $0 $@" >&2
   exit 1
 }
 
@@ -66,18 +67,29 @@ fi
 sudo /opt/sbin/drop-caches
 
 # Make sure there's no errant ownerships.
-#WRONG_PERMS="$(find "$DEPOSITORY" \( \! -user "$SBOSRCARCH_USER" -o \! -group "$DEPOSITORY_GROUP" \) -a \! -path "$DEPOSITORY" -printf "%u:%g\t%P\n")"
-if [[ -n "$WRONG_PERMS" ]]; then
-  printf "%s\\n" "This run has been aborted!" >"$LOGSDIR/$LOGFILE"
-  printf "%s\\n" "The following files in have errant permissions:" >>"$LOGSDIR/$LOGFILE"
-  printf "%s\\n" "$WRONG_PERMS" >>"$LOGSDIR/$LOGFILE"
+printf "%s: %s\\n" "INFO" "Scanning sbosrcarch directory for correct ownerships/permissions" | tee "$LOGSDIR/$LOGFILE"
+WRONG="$(find "$DEPOSITORY/" \( \
+    \( -type b -o -type c -o -type p -o -type s \) -o \
+    \( -type l -a \! -perm 777 \) -o \
+    \( -type d -a \! -perm 755 -a \! -perm 2755 \) -o \
+    \( -type f -a \! -perm 644 -a \! -perm  755 \) -o \
+    \( \! -user "$SBOSRCARCH_USER" \) -o \
+    \( \! -group "$DEPOSITORY_GROUP" \) \
+    \) -a -printf "%u:%g\t%M\t%p\n")"
+if [[ -n "$WRONG" ]]; then
+  printf "%s: %s\\n" "ERROR" "This run has been aborted!" | tee -a "$LOGSDIR/$LOGFILE"
+  printf "%s: %s\\n" "WARNING" "The following paths have erronious ownerships/permissions:" | tee -a "$LOGSDIR/$LOGFILE"
+  printf "%s\\n" "$WRONG" | sed -re 's/^/  /g' | tee -a "$LOGSDIR/$LOGFILE"
   ERR=-1
 else
+  printf "%s: %s\\n" "INFO" "No ownership/permission issues found" | tee -a "$LOGSDIR/$LOGFILE"
   # Do the sbosrcarch work.
-  sg "$DEPOSITORY_GROUP" -c "$COMMAND ${1:-update}" >"$LOGSDIR/$LOGFILE" 2>&1
+  umask 022
+  printf "%s: %s: %s\\n" "INFO" "Beginning sbosrcarch run" "sg \"$DEPOSITORY_GROUP\" -c \"$COMMAND ${1:-update}\"" | tee -a "$LOGSDIR/$LOGFILE"
+  TMP_OUTPUT="$(sg "$DEPOSITORY_GROUP" -c "$COMMAND ${1:-update} 2>&1")"
   ERR="$?"
-  printf "\\n" >>"$LOGSDIR/$LOGFILE"
-  sg "$DEPOSITORY_GROUP" -c "$COMMAND status" >>"$LOGSDIR/$LOGFILE" 2>&1
+  sg "$DEPOSITORY_GROUP" -c "$COMMAND status 2>&1" | tee -a "$LOGSDIR/$LOGFILE"
+  printf "\\n%s\\n" "$TMP_OUTPUT" | tee -a "$LOGSDIR/$LOGFILE"
   (( ERR += $? ))
 fi