diff --git a/bootstrap-common.sh b/bootstrap-common.sh
index b912b01..a510010 100755
--- a/bootstrap-common.sh
+++ b/bootstrap-common.sh
@@ -70,9 +70,9 @@ build_autoconf libvorbis "${LIBVORBIS_VERSION}" "--disable-examples"
 FLAC_EXTRAFLAGS="--disable-doxygen-docs --disable-examples --disable-thorough-tests --disable-xmms-plugin"
 
 if [ "${MACOS_OLD}" -eq 1 ]; then
-    FLAC_EXTRAFLAGS="${FLAC_EXTRAFLAGS} --disable-asm-optimizations"
+    FLAC_EXTRAFLAGS+=" --disable-asm-optimizations"
 elif [ "${MACOS_UNIVERSAL}" -eq 1 ]; then
-    FLAC_EXTRAFLAGS="${FLAC_EXTRAFLAGS} ac_cv_header_x86intrin_h=yes asm_opt=yes"
+    FLAC_EXTRAFLAGS+=" ac_cv_header_x86intrin_h=yes asm_opt=yes"
 fi
 
 download flac "${FLAC_VERSION}" "https://ftp.osuosl.org/pub/xiph/releases/flac" "tar.xz"
diff --git a/bootstrap-jack2.sh b/bootstrap-jack2.sh
index f45b2d1..be207fb 100755
--- a/bootstrap-jack2.sh
+++ b/bootstrap-jack2.sh
@@ -33,6 +33,9 @@ source setup/versions.sh
 
 if [ "${MACOS}" -eq 1 ]; then
     download aften "${AFTEN_VERSION}" "http://downloads.sourceforge.net/aften" "tar.bz2"
+    if [ ! -f "${PAWPAW_BUILDDIR}/aften-${AFTEN_VERSION}/.stamp_installed" ]; then
+        rm -f "${PAWPAW_BUILDDIR}/aften-${AFTEN_VERSION}/.stamp_installed_libs"
+    fi
     build_cmake aften "${AFTEN_VERSION}"
     if [ ! -f "${PAWPAW_BUILDDIR}/aften-${AFTEN_VERSION}/.stamp_installed_libs" ]; then
     	cp -v "${PAWPAW_BUILDDIR}/aften-${AFTEN_VERSION}/build/libaften_pcm.a" "${PAWPAW_PREFIX}/lib/libaften_pcm.a"
@@ -55,13 +58,13 @@ function build_custom_db() {
     local pkgdir="${PAWPAW_BUILDDIR}/${name}-${version}"
 
     if [ "${CROSS_COMPILING}" -eq 1 ]; then
-        extraconfrules="--host=${TOOLCHAIN_PREFIX} ${extraconfrules}"
+        extraconfrules+=" --host=${TOOLCHAIN_PREFIX}"
     fi
     if [ "${MACOS}" -eq 1 ]; then
-        extraconfrules="--enable-posixmutexes ${extraconfrules}"
+        extraconfrules+=" --enable-posixmutexes"
     fi
     if [ "${WIN32}" -eq 1 ]; then
-        extraconfrules="--enable-mingw ${extraconfrules}"
+        extraconfrules+="--enable-mingw"
     fi
 
     _prebuild "${name}" "${pkgdir}"
@@ -149,7 +152,7 @@ fi
 
 # ---------------------------------------------------------------------------------------------------------------------
 # tre (win64 32bit build)
-# NOTE this must be the last item to build
+# NOTE: this must be the last item to build
 
 if [ "${WIN64}" -eq 1 ]; then
     target="win32"
diff --git a/bootstrap-plugins.sh b/bootstrap-plugins.sh
index c93b7bf..d75d2d0 100755
--- a/bootstrap-plugins.sh
+++ b/bootstrap-plugins.sh
@@ -31,11 +31,11 @@ source setup/versions.sh
 FFTW_EXTRAFLAGS="--disable-alloca --disable-fortran --with-our-malloc"
 
 if [ "${MACOS_UNIVERSAL}" -eq 0 ]; then
-    FFTW_EXTRAFLAGS="${FFTW_EXTRAFLAGS} --enable-sse2"
+    FFTW_EXTRAFLAGS+=" --enable-sse2"
 fi
 
 # if [ "${WIN32}" -eq 0 ]; then
-#     FFTW_EXTRAFLAGS="${FFTW_EXTRAFLAGS} --enable-threads"
+#     FFTW_EXTRAFLAGS+=" --enable-threads"
 # fi
 
 download fftw "${FFTW_VERSION}" "http://www.fftw.org"
diff --git a/setup/check_target.sh b/setup/check_target.sh
index 8b06ed9..8d66fe5 100644
--- a/setup/check_target.sh
+++ b/setup/check_target.sh
@@ -37,7 +37,7 @@ function check_target() {
         "native")
             target=$(uname -s)
             check_target
-            if [ "$(uname -m)" = "arm64" ]; then
+            if [ "${target}" = "Darwin" ] && [ "$(uname -m)" = "arm64" ]; then
                 MACOS_UNIVERSAL=1
             fi
             ;;
diff --git a/setup/env.sh b/setup/env.sh
index 8c2b5c0..47a75ba 100644
--- a/setup/env.sh
+++ b/setup/env.sh
@@ -9,10 +9,10 @@ if [ "${LINUX}" -eq 1 ]; then
 
 elif [ "${MACOS}" -eq 1 ]; then
     CMAKE_SYSTEM_NAME="Darwin"
-    if [ "${MACOS_UNIVERSAL}" -eq 1 ]; then
-        PAWPAW_TARGET="macos-universal"
-    elif [ "${MACOS_OLD}" -eq 1 ]; then
+    if [ "${MACOS_OLD}" -eq 1 ]; then
         PAWPAW_TARGET="macos-old"
+    elif [ "${MACOS_UNIVERSAL}" -eq 1 ]; then
+        PAWPAW_TARGET="macos-universal"
     else
         PAWPAW_TARGET="macos"
     fi
@@ -45,26 +45,25 @@ PAWPAW_TMPDIR="/tmp"
 ## build flags
 
 BUILD_FLAGS="-O2 -pipe -I${PAWPAW_PREFIX}/include"
-BUILD_FLAGS="${BUILD_FLAGS} -mtune=generic -msse -msse2 -ffast-math"
-BUILD_FLAGS="${BUILD_FLAGS} -fPIC -DPIC -DNDEBUG -D_FORTIFY_SOURCE=2"
-BUILD_FLAGS="${BUILD_FLAGS} -fdata-sections -ffunction-sections -fno-common -fstack-protector -fvisibility=hidden"
+BUILD_FLAGS+=" -mtune=generic -msse -msse2 -ffast-math"
+BUILD_FLAGS+=" -fPIC -DPIC -DNDEBUG -D_FORTIFY_SOURCE=2"
+BUILD_FLAGS+=" -fdata-sections -ffunction-sections -fno-common -fstack-protector -fvisibility=hidden"
 
-if [ "${MACOS_UNIVERSAL}" -ne 1 ]; then
-    BUILD_FLAGS="${BUILD_FLAGS} -mfpmath=sse"
+if [ "${MACOS_UNIVERSAL}" -eq 0 ]; then
+    BUILD_FLAGS+=" -mfpmath=sse"
 fi
 
 if [ "${MACOS}" -eq 1 ]; then
-    if [ "${MACOS_UNIVERSAL}" -eq 1 ]; then
-        BUILD_FLAGS="${BUILD_FLAGS} -mmacosx-version-min=10.12 -arch x86_64 -arch arm64 -Wno-unused-command-line-argument"
-    elif [ "${MACOS_OLD}" -eq 1 ]; then
-        BUILD_FLAGS="${BUILD_FLAGS} -mmacosx-version-min=10.5"
+    if [ "${MACOS_OLD}" -eq 1 ]; then
+        BUILD_FLAGS+=" -DMAC_OS_X_VERSION_MAX_ALLOWED=MAC_OS_X_VERSION_10_5 -mmacosx-version-min=10.5"
+    elif [ "${MACOS_UNIVERSAL}" -eq 1 ]; then
+        BUILD_FLAGS+=" -DMAC_OS_X_VERSION_MAX_ALLOWED=MAC_OS_X_VERSION_10_12 -mmacosx-version-min=10.12 -arch x86_64 -arch arm64"
     else
-        BUILD_FLAGS="${BUILD_FLAGS} -mmacosx-version-min=10.8 -stdlib=libc++ -Wno-deprecated-declarations"
+        BUILD_FLAGS+=" -DMAC_OS_X_VERSION_MAX_ALLOWED=MAC_OS_X_VERSION_10_8 -mmacosx-version-min=10.8 -stdlib=libc++ -Wno-deprecated-declarations"
     fi
 elif [ "${WIN32}" -eq 1 ]; then
-    BUILD_FLAGS="${BUILD_FLAGS} -DPTW32_STATIC_LIB -mstackrealign"
+    BUILD_FLAGS+=" -DFLUIDSYNTH_NOT_A_DLL -DPTW32_STATIC_LIB -mstackrealign"
 fi
-# -DFLUIDSYNTH_NOT_A_DLL
 
 TARGET_CFLAGS="${BUILD_FLAGS}"
 TARGET_CXXFLAGS="${BUILD_FLAGS} -fvisibility-inlines-hidden"
@@ -72,23 +71,22 @@ TARGET_CXXFLAGS="${BUILD_FLAGS} -fvisibility-inlines-hidden"
 ## link flags
 
 LINK_FLAGS="-L${PAWPAW_PREFIX}/lib"
-LINK_FLAGS="${LINK_FLAGS} -fdata-sections -ffunction-sections -fstack-protector"
+LINK_FLAGS+=" -fdata-sections -ffunction-sections -fstack-protector"
 
 if [ "${MACOS}" -eq 1 ]; then
-    LINK_FLAGS="${LINK_FLAGS} -Wl,-dead_strip -Wl,-dead_strip_dylibs"
+    LINK_FLAGS+=" -Wl,-dead_strip -Wl,-dead_strip_dylibs"
 
-    if [ "${MACOS_UNIVERSAL}" -eq 1 ]; then
-        LINK_FLAGS="${LINK_FLAGS} -mmacosx-version-min=10.12 -arch x86_64 -arch arm64"
-    elif [ "${MACOS_OLD}" -eq 1 ]; then
-        LINK_FLAGS="${LINK_FLAGS} -mmacosx-version-min=10.5"
-        # LINK_FLAGS="${LINK_FLAGS} -L/usr/lib/apple/SDKs/MacOSX10.5.sdk/usr/lib"
+    if [ "${MACOS_OLD}" -eq 1 ]; then
+        LINK_FLAGS+=" -mmacosx-version-min=10.5"
+    elif [ "${MACOS_UNIVERSAL}" -eq 1 ]; then
+        LINK_FLAGS+=" -mmacosx-version-min=10.12 -arch x86_64 -arch arm64"
     else
-        LINK_FLAGS="${LINK_FLAGS} -mmacosx-version-min=10.8 -stdlib=libc++"
+        LINK_FLAGS+=" -mmacosx-version-min=10.8 -stdlib=libc++"
     fi
 else
-    LINK_FLAGS="${LINK_FLAGS} -Wl,-O1 -Wl,--as-needed -Wl,--gc-sections -Wl,--no-undefined -Wl,--strip-all"
+    LINK_FLAGS+=" -Wl,-O1 -Wl,--as-needed -Wl,--gc-sections -Wl,--no-undefined -Wl,--strip-all"
     if [ "${WIN32}" -eq 1 ]; then
-        LINK_FLAGS="${LINK_FLAGS} -static -lssp_nonshared -Wl,-Bstatic"
+        LINK_FLAGS+=" -static -lssp_nonshared -Wl,-Bstatic"
     fi
 fi
 
@@ -130,18 +128,21 @@ if which nproc > /dev/null; then
 fi
 
 if [ "${CROSS_COMPILING}" -eq 1 ]; then
-    MAKE_ARGS="${MAKE_ARGS} CROSS_COMPILING=true"
+    MAKE_ARGS+=" CROSS_COMPILING=true"
 fi
 
 if [ "${MACOS}" -eq 1 ]; then
-    MAKE_ARGS="${MAKE_ARGS} MACOS=true"
-    if [ "${MACOS_UNIVERSAL}" -eq 1 ]; then
-        MAKE_ARGS="${MAKE_ARGS} MACOS_UNIVERSAL=true"
-    elif [ "${MACOS_OLD}" -eq 1 ]; then
-        MAKE_ARGS="${MAKE_ARGS} MACOS_OLD=true"
+    MAKE_ARGS+=" MACOS=true"
+    if [ "${MACOS_OLD}" -eq 1 ]; then
+        MAKE_ARGS+=" MACOS_OLD=true"
+    elif [ "${MACOS_UNIVERSAL}" -eq 1 ]; then
+        MAKE_ARGS+=" MACOS_UNIVERSAL=true"
     fi
 elif [ "${WIN32}" -eq 1 ]; then
-    MAKE_ARGS="${MAKE_ARGS} WIN32=true WINDOWS=true"
+    MAKE_ARGS+=" WINDOWS=true WIN32=true"
+    if [ "${WIN32}" -eq 1 ]; then
+        MAKE_ARGS+=" WIN64=true"
+    fi
 fi
 
 # ---------------------------------------------------------------------------------------------------------------------