diff --git a/extra/bdisk.png b/extra/bdisk.png
index e69de29..2db6aca 100644
Binary files a/extra/bdisk.png and b/extra/bdisk.png differ
diff --git a/extra/packages.both b/extra/packages.both
index 697f759..b9c5982 100644
--- a/extra/packages.both
+++ b/extra/packages.both
@@ -159,7 +159,8 @@ mcelog
 md5deep
 mdadm
 mdcrack
-megaraid-cli
+# superseded by storcli
+#megaraid-cli
 memtester
 mfoc
 minicom
@@ -184,7 +185,8 @@ nmap
 nmon
 ntfs-3g
 ntfsfixboot
-nwipe
+#nwipe #broken since they moved to github(?)
+nwipe-git
 obnam
 open-iscsi
 openipmi
@@ -253,6 +255,7 @@ smbclient
 s-nail
 socat
 #star ## do people even USE tape packups anymore?
+storcli
 strace
 stress
 sucrack
diff --git a/extra/pre-build.d/etc/customizepkg.d/dd_rhelp b/extra/pre-build.d/etc/customizepkg.d/dd_rhelp
new file mode 100755
index 0000000..be58499
--- /dev/null
+++ b/extra/pre-build.d/etc/customizepkg.d/dd_rhelp
@@ -0,0 +1,3 @@
+#!/bin/bash
+
+sed -i -e 's/build(/package(/g' ${1}
diff --git a/extra/pre-build.d/etc/customizepkg.d/lsiutil b/extra/pre-build.d/etc/customizepkg.d/lsiutil
new file mode 100755
index 0000000..2c98a83
--- /dev/null
+++ b/extra/pre-build.d/etc/customizepkg.d/lsiutil
@@ -0,0 +1,3 @@
+#!/bin/bash
+
+sed -re 's@^(source=\(").*$@\1https://github.com/kwilczynski/lsi/blob/master/lsiutil/LSIUtil_1.62.zip?raw=true")@g' ${1}
diff --git a/extra/pre-build.d/etc/customizepkg.d/whdd b/extra/pre-build.d/etc/customizepkg.d/whdd
new file mode 100755
index 0000000..34d9169
--- /dev/null
+++ b/extra/pre-build.d/etc/customizepkg.d/whdd
@@ -0,0 +1,7 @@
+#!/bin/bash
+
+if [[ ! -f "/usr/lib/libdialog.so" ]];
+then
+  echo "Please run the following: sudo ln -s /usr/lib/libdialog.so.1.2 /usr/lib/libdialog.so"
+  echo "This package will fail to build otherwise."
+fi
diff --git a/extra/pre-build.d/etc/customizepkg.d/wifite-mod-pixiewps-git b/extra/pre-build.d/etc/customizepkg.d/wifite-mod-pixiewps-git
index 09e4380..5091a4e 100755
--- a/extra/pre-build.d/etc/customizepkg.d/wifite-mod-pixiewps-git
+++ b/extra/pre-build.d/etc/customizepkg.d/wifite-mod-pixiewps-git
@@ -1,3 +1,3 @@
 #!/bin/bash
 
-sed -i -e 's/any/x86_64/g' ${1}
+sed -i -re "s/'any'/'i686' 'x86_64'/g" ${1}
diff --git a/extra/pre-build.d/root/post-build.sh b/extra/pre-build.d/root/post-build.sh
index 7f3422b..112967f 100755
--- a/extra/pre-build.d/root/post-build.sh
+++ b/extra/pre-build.d/root/post-build.sh
@@ -3,6 +3,6 @@
 set -e
 
 apacman --noconfirm --noedit -S --needed customizepkg-scripting
-
+ln -s /usr/lib/libdialog.so.1.2 /usr/lib/libdialog.so
 
 echo "Done."
diff --git a/lib/01-mk.chroot.func.sh b/lib/01-mk.chroot.func.sh
index dade06e..e2a55e7 100755
--- a/lib/01-mk.chroot.func.sh
+++ b/lib/01-mk.chroot.func.sh
@@ -253,6 +253,7 @@ EOF
  for i in ${CHROOTDIR32} ${CHROOTDIR64};
  do
     echo "Running post-build tasks in ${i}..."
+    chmod 700 ${i}/root/post-build.sh
     ${CHROOTCMD} ${i}/ "/root/post-build.sh" >> "${LOGFILE}.${FUNCNAME}" 2>&1
     for x in $(find ${i}/etc/ -type f -iname "*.pacorig");do mv -f ${x} ${x%%.pacorig} ; done
     set +e
diff --git a/lib/prereqs/Mageia/meta b/lib/prereqs/Mageia/meta
index 6a86a74..4f62a30 100644
--- a/lib/prereqs/Mageia/meta
+++ b/lib/prereqs/Mageia/meta
@@ -1,5 +1,5 @@
 NAME='Mageia'
-SUPPORTED='untested'
+SUPPORTED='yes'
 CHECK_METHOD='egrep "^Mageia\ release\ " /etc/mageia-release'
 PKG_MGR='urpmi --force --auto ${pkgname}'
 PRE_RUN='urpmi.update -a'
diff --git a/lib/prereqs/Manjaro/meta b/lib/prereqs/Manjaro/meta
index f19f900..d8c54a0 100644
--- a/lib/prereqs/Manjaro/meta
+++ b/lib/prereqs/Manjaro/meta
@@ -1,8 +1,8 @@
 NAME='Manjaro'
-SUPPORTED='untested'
+SUPPORTED='yes'
 CHECK_METHOD='egrep "^NAME=\"Manjaro Linux\"$" /etc/os-release'
 PKG_MGR='pacman -S --needed --noconfirm ${pkgname}'
-PRE_RUN='pacman -Syyyu'
+PRE_RUN='pacman -Syyy --noconfirm'
 PKG_CHK='pacman -Q ${pkgname}'
 URL='https://manjaro.org/'
 
@@ -20,6 +20,7 @@ function distro_specific_tweaks {
    if [[ "${?}" == "0" ]];
    then
      pacman -Rdd --noconfirm ${pkg_override} >> "${LOGFILE}.${FUNCNAME}" 2>&1
+     pacman -S --noconfirm ${pkg_override}-multilib >> "${LOGFILE}.${FUNCNAME}" 2>&1
    fi
  done
 set -e
diff --git a/lib/prereqs/Mint/meta b/lib/prereqs/Mint/meta
index 36f219e..6cf9728 100644
--- a/lib/prereqs/Mint/meta
+++ b/lib/prereqs/Mint/meta
@@ -1,6 +1,7 @@
 NAME='Mint'
-SUPPORTED='untested'
-CHECK_METHOD='egrep "^DESCRIPTION=\"Linux\ Mint\"" /etc/linuxmint/info'
+SUPPORTED='no'
+# Needs non-systemd chroot method
+CHECK_METHOD='egrep "^DESCRIPTION=\"Linux\ Mint" /etc/linuxmint/info'
 PKG_MGR='apt-get -y install ${pkgname}'
 PRE_RUN='apt-get -y update'
 PKG_CHK='dpkg-query -l ${pkgname}'
diff --git a/lib/prereqs/Ubuntu/pkgs b/lib/prereqs/Ubuntu/pkgs
index e8fc697..a336afe 100644
--- a/lib/prereqs/Ubuntu/pkgs
+++ b/lib/prereqs/Ubuntu/pkgs
@@ -5,12 +5,11 @@ dosfstools
 gcc
 gcc-multilib
 git
-isolinux
 libiberty-dev
 libisoburn1
 lynx
 liblzma5
-liblsma-dev
+liblzma-dev
 make
 mtools
 patch
@@ -19,7 +18,6 @@ rsync
 sed
 squashfs-tools
 syslinux
-syslinux-efi
 xorriso
 xz-utils
 zlib1g