diff --git a/bldpkg b/bldpkg
index e8b9995..8aea5bc 100644
--- a/bldpkg
+++ b/bldpkg
@@ -193,7 +193,7 @@ for requiredfile in "${rqfiles[@]}"; do
   fi
 done
 
-# Function for providing handy arguments to users. Some will override bldpkg.conf.
+# While loop for providing handy arguments to users. Some will override bldpkg.conf.
 while getopts ':def:ghj:o:rsvx' option; do
   case "$option" in
     d) debug=1 ;; # Produce a debug build with -g3
@@ -212,6 +212,7 @@ while getopts ':def:ghj:o:rsvx' option; do
   esac
 done
 
+# Function to error out the build in absence of a build file
 nopackagebuildfileerror() {
   err "No package build file to source from!
 Was expecting '$buildfile' to be present inside this directory '$PWD'.
@@ -323,49 +324,16 @@ if [[ $genchecksum = 1 ]] ; then
   exit 0
 fi
 
-# Display the package and its version we are building
-info "Building package '$app' version '$version' ..."
+# Display the package and its version we are building or resuming
+if [[ -z $resumepkgbuild ]] ; then
+  info "Building package '$app' version '$version' ..."
 sleep 0.5
-
-# Invoke auditd if useauditd is set to 1 in bldpkg.conf
-if [[ $useauditd = 1 ]] ; then
-  
-  if [[ ! -x /bin/auditd ]] ; then
-    err "Program 'auditd' not found!"
-  fi
-
-  # First clear out the log file
-  auditlogfile="/var/log/audit/audit.log"
-  echo > $auditlogfile
-
-  # Now run auditd 
-  /bin/auditd -n &
-
-  # Store the PID inside a variable
-  auditpid=$!
-
-  # Note: auditd writes about 6-8 lines for our setup when initialized.
-  info "/bin/auditd initialised."
+else
+  info "Resuming build of package '$app' version '$version' ..."
 fi
 
-# Function to safely terminate auditd.
-terminateauditd() {
-  if [[ $useauditd = 1 ]] ; then
-    # Terminate auditd, log number of lines inside a variable
-    /bin/kill "$auditpid"
-    info "/bin/auditd stopped."
-
-    auditlogtermsize=$(wc -l < $auditlogfile)
-
-    if [[ $auditlogtermsize -gt 10 ]] ; then
-      warn "Auditd log file '$auditlogfile' is greater than 10 lines!
-Highly recommend that you examine its file!"
-      sleep 5
-    fi
-  fi
-}
-
-# sha512sums variable is expected in every single package build file
+# Check integrity of files defined in sha512sums variable which is expected 
+# in nearly every single package build file
 if [[ -z $sha512sums ]] ; then 
   err "SHA512 checksums don't exist in '$buildfile'! Please run 'bldpkg -g' to add them"
 fi
@@ -384,8 +352,7 @@ done
 
 unset IFS
 
-# Function to output to the user which patch is about to be applied. Useful when there are many
-# patches and you want to determine which patch failed. 
+# Function for applying patches to the build in a more efficient manner
 applypatch() {
   # Take patch file name as the first argument
   patchfile="$1"
@@ -543,8 +510,8 @@ Kindly add/increase swap size on this system and try again."
   fi
 fi
 
-# Set the temporary directory for building the package. Also define package staging directory.
-# This is where package files that get "installed" go into, for example 'make install DESTDIR=$pkg' 
+# Set the build and package staging directories. This is where package 
+# files that get "installed" go into, for example 'make install DESTDIR=$pkg' 
 # or 'DESTDIR="$pkg" ninja install'.
 
 # If usetmpfs is set to 1, tmpfsdir is defined and tmpfscheckfailed  variable is unset, determine 
@@ -897,10 +864,10 @@ fixbuilddirpermissions() {
   find -L .  -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \
    \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+ || true
 
-  # Only put $app.extraction.complete file if $extractioncomplete is unset.
+  # Only put $app-$version.extraction.complete file if $extractioncomplete is unset.
   # This ensures that the file is only set once.
   if [[ -z $extractioncomplete ]] ; then
-    touch ".$app.extraction.complete" 
+    touch ".$app-$version.extraction.complete" 
     extractioncomplete=1
   fi
 }
@@ -973,7 +940,7 @@ preprunitservice() {
 mkfinalpkg() {
 
   # Now we attempt to split the total time we'll get when making the summary into two times: compile
-  # time and packaging time. Here we store the value of $SECONDS variable the moment makefinalpkg is
+  # time and packaging time. Here we store the value of $SECONDS variable the moment mkfinalpkg is
   # invoked. We use this value as the compile time, because this is the next function that's called
   # by the build script the moment a successful compile make install  DESTDIR=$pkg or something similar. 
 
@@ -990,19 +957,16 @@ mkfinalpkg() {
    
   # Check if /lib64 was created inside $pkg
   if [[ -d $pkg/lib64 ]] ; then
-    err "'$app' has /lib64 directory. Musl does not support multilib.
+    err "'$app' has /lib64 directory within the staging directory. Musl does not support multilib.
 Please fix the build options and ensure the /lib64 is not created."
   fi
    
-  # Check if /usr and /sbin were created inside $pkg only if allowusrdir=1 is not set in the package build file
-  # For a package that stubbornly insists on having its stuff installed in /usr , add 'ignoreusr=1' at the top
+  # Check if /usr and /sbin were created inside staging directory $pkg 
   # of its build file
   for directory in usr sbin ; do
     if [[ -d $pkg/$directory ]] ; then
-      if [[ -z "$ignoreusr" ]] ; then
-        err "'$app' has '$directory' directory which is a symlink to /bin on SMLinux.
-Please fix the build options and ensure '$directory' is not created."
-      fi
+      err "'$app' has '$directory' directory within the staging directory which is a symlink to /bin on SMLinux.
+Please fix the build options and ensure '$directory' is not created"
     fi
   done
 
@@ -1150,9 +1114,6 @@ Moving its contents into share/doc/$app-$version/"
   echo ""
   info "SMLinux package '$app-$version-$arch-$build.$pkgext' successfully generated in $pkgdest."
 
-  # Terminate auditd daemon
-  terminateauditd
-  
   # Terminate sccache
   if [[ $globalsccache = 1  ]] ; then
     info "Terminating sccache"
@@ -1168,9 +1129,9 @@ Moving its contents into share/doc/$app-$version/"
   cd "$srcdir"
 
 
+  # With SECONDS reset, the shell will add in a fresh value, which we can now use to ascertain 
+  # the packaging time, by again passing that value as an argument to the runtime function
   if [[ $showsummary = 1 ]] || [[ $htmloutput  = 1 ]] ; then
-    # With SECONDS reset, the shell will add in a fresh value, which we can now use to ascertain 
-    # the packaging time, by again passing that value as an argument to the runtime function
     packagetimea="$SECONDS"
     packagetimeb=$(runtime "$packagetimea")
   fi
@@ -1438,7 +1399,6 @@ promptuser() {
     info "Extracting package installer inside $srcdir/test..."
     mkdir -p "$srcdir/test"
     tar xvf "$newpkglocation" -C "$srcdir/test"
-    echo ""
     info "'$app' package installer file successfully extracted"
   fi
 
@@ -1446,43 +1406,25 @@ promptuser() {
   # into a subdirectory called "test" inside the package source directory the build was manually initiated from.
   # Has no effect on autobuilds since they are simply installed right away.
   if [[ $extractprompt = 1 ]] && [[ -z $autobuild ]] && [[ -n $newpkglocation ]] ; then
-    while true ; do
-      echo
-      echo "[NOTIFY] '$app' has been built and extractprompt is enabled in"
-      echo "[NOTIFY] bldpkg.conf file. Would you like to extract and examine contents"
-      echo "[NOTIFY] of its package installer in a 'test' directory within the"
-      echo "[NOTIFY] current source directory"
-      echo "[NOTIFY] ($srcdir) ?"
-
-      read -r -p "[NOTIFY] Old test directory, if it exists already, will be overwritten. (y/N) " yn
-
+    read -r -p "[NOTIFY] Would you like the package installer of '$app-$version' to be extracted in your current directory '$srcdir' for examination? (y/N) " yn
       case "$yn" in
-        [Yy]* ) info "Wise choice :-) ";
-               mkdir -p "$srcdir/test"
-               tar xvf "$newpkglocation" -C "$srcdir/test"
-               echo ""
-               info "'"$app"' package installer file successfully extracted"
-               break;;
-             *) info "Nope? Alright." ; break ;;
+        Y|y) info "Wise Choice :-)" ;
+             mkdir -p "$srcdir/test" 
+             tar xvf "$newpkglocation" -C "$srcdir/test" ;
+             info "'"$app"' package installer file successfully extracted" ;;
+          *) info "Nope? Alright " ;;
       esac
-    done
   fi
 
   # Prompt the user at the end of a successful build whether to install the newly created package. 
   # Has no effect on autobuilds because packages there are installed automatically.
   if [[ $installprompt = 1 ]] && [[ -z $autobuild ]] && [[ -n $newpkglocation ]] ; then
-    while true ; do 
-      echo
-      echo "[NOTIFY] '$app' successfully built and installprompt is enabled in the bldpkg.conf file."
-
-      read -r -p "[NOTIFY] Would you like to install/upgrade it? (y/N) " yn
+      read -r -p "[NOTIFY] Would you like the package installer of '$app-$version' to be installed/upgraded onto your system? (y/N) " yn
       case "$yn" in 
-        [Yy]* ) info "Wise choice :-) "
-               upgradepkg --install-new "$newpkglocation"
-               break;;
-             *) info "Nope? Alright." ; exit 0 ;;
+        Y|y) info "Wise choice :-) " ;
+             upgradepkg --install-new "$newpkglocation" ;;
+          *) info "Nope? Alright." ;;
       esac
-    done
   fi
 
   if [[ $pkgstatus = 0 ]]; then
@@ -1500,9 +1442,6 @@ interruptoutput() {
   # Restore terminal colours
   echo -e "$colourd"
 
-  # Terminate auditd daemon
-  terminateauditd
-
   # Terminate sccache
   if [[ $globalsccache = 1 ]] ; then
     info "Terminating sccache"
@@ -1526,13 +1465,14 @@ interruptoutput() {
 trap "prepbuildoutput" EXIT
 trap "interruptoutput" INT
 
-# Prompt the user to resume the current build if $app.extraction.complete is found inside $tmp
-# and if $resumepkgbuild from getopts is unset.
-buildresumepath="$(find $tmp -type f -name .$app.extraction.complete)"
-if [[ -f $buildresumepath ]] && [[ -z $resumepkgbuild ]] && [[ $autoresumepkgbuild = 1 ]] ; then
-  echo "[NOTIFY] Found $buildresumepath."
-  echo "[NOTIFY] Hit 'Y' to resume building from current src,"
-  echo "[NOTIFY] Hit 'N' to start building from scratch by removing old src."
+# If $tmp exists, get the path to the $.app-$version.extraction.complete file
+if [[ -d $tmp ]] ; then
+  buildresumepath="$(find $tmp -type f -name .$app-$version.extraction.complete)"
+fi
+
+# If  the above file exists, $resumepkgbuild and $autobuild are unset
+# and $autoresumepkgbuild is set to 1 in /etc/bldpkg.conf, prompt the user
+if [[ -f $buildresumepath ]] && [[ -z $resumepkgbuild ]] && [[ $autoresumepkgbuild = 1 ]] && [[ -z $autobuild ]]; then
   read -r -p "[NOTIFY] Would you like to resume building? " yn
   case "$yn" in 
     N|n|No|no) info "Nope? Alright." ; 
@@ -1554,7 +1494,7 @@ fi
 if [[ -n $resumepkgbuild ]] ; then
   mkandenterbuilddir
 
-  # fixbuilddirpermissions places a file ".$app.extraction.complete". Get the directory name that houses that file
+  # fixbuilddirpermissions places a file ".$app-$version.extraction.complete". Get the directory name that houses that file
   # and cd into it
   if [[ ! -f $buildresumepath ]] ; then
     err "Can't resume build of '"$app"'! Are you certain the source was extracted completely?"