diff --git a/etc/archboot/default.conf b/etc/archboot/default.conf
index b46bf4514..aa2dd2d4c 100644
--- a/etc/archboot/default.conf
+++ b/etc/archboot/default.conf
@@ -17,7 +17,7 @@ arch_filesystems arch_remote arch_cpufreq arch_links arch_kexec arch_ppp arch_xl
 arch_pppoe arch_grub arch_refind arch_gummiboot arch_efibootmgr arch_syslinux arch_iptables arch_pciutils \
 arch_usbutils arch_openvpn arch_vpnc arch_pptpclient arch_smartmontools arch_licenses arch_wireless \
 arch_wireless_staging arch_linux_atm arch_netctl arch_fsarchiver arch_vim arch_wipe \
-arch_testdisk arch_ddrescue arch_chntpw arch_platform arch_dmidecide arch_wiki_lite \
+arch_testdisk arch_ddrescue arch_chntpw arch_platform arch_dmidecode arch_wiki_lite \
 arch_intel_ucode arch_wvdial arch_usb_modeswitch \
 arch_lockdown-ms arch_prebootloader arch_efivar net"
 
diff --git a/usr/lib/initcpio/install/arch_base b/usr/lib/initcpio/install/arch_base
index 76c273bf3..0039cc87e 100644
--- a/usr/lib/initcpio/install/arch_base
+++ b/usr/lib/initcpio/install/arch_base
@@ -42,8 +42,11 @@ build ()
               /usr/bin/lzma /usr/bin/modinfo /usr/bin/modprobe /usr/bin/nc /usr/bin/reset /usr/bin/rmmod \
               /usr/bin/unlzma /usr/bin/unxz /usr/bin/xzcat /usr/bin/lastb /usr/bin/sh"
     for i in $symlinks; do
-        add_binary "$(which $(basename $(readlink "$i")))"
-        add_symlink "$i" "$(which $(basename $(readlink "$i")))"
+        echo "Checking $i"
+        # if [ -e $i ]; then
+            add_binary "$(which "$(basename "$(readlink "$i")")")"
+            add_symlink "$i" "$(which "$(basename "$(readlink "$i")")")"
+        # fi
     done
     add_symlink "/usr/bin/init" "/usr/lib/systemd/systemd"
     add_symlink "/init" "/usr/lib/systemd/systemd"
@@ -103,8 +106,11 @@ build ()
     done
     symlinks="/usr/bin/vigr"
     for i in $symlinks; do
-        add_binary "$(which $(basename $(readlink "$i")))"
-        add_symlink "$i" "$(which $(basename $(readlink "$i")))"
+        echo "Checking $i"
+        # if [ -e $i ]; then
+            add_binary "$(which "$(basename "$(readlink "$i")")")"
+            add_symlink "$i" "$(which "$(basename "$(readlink "$i")")")"
+        # fi
     done
     add_file "/etc/login.defs"
 
@@ -171,8 +177,11 @@ build ()
     done
     symlinks="/usr/bin/gpg /usr/bin/repo-remove"
     for i in $symlinks; do
-        add_binary "$(which $(basename $(readlink "$i")))"
-        add_symlink "$i" "$(which $(basename $(readlink "$i")))"
+        echo "Checking $i"
+        # if [ -e $i ]; then
+            add_binary "$(which "$(basename "$(readlink "$i")")")"
+            add_symlink "$i" "$(which "$(basename "$(readlink "$i")")")"
+        # fi
     done
     add_dir "/var/cache/pacman/pkg"
     add_dir "/var/lib/pacman"
diff --git a/usr/lib/initcpio/install/arch_bootmessage b/usr/lib/initcpio/install/arch_bootmessage
index 5113feca1..033eddcb9 100644
--- a/usr/lib/initcpio/install/arch_bootmessage
+++ b/usr/lib/initcpio/install/arch_bootmessage
@@ -3,6 +3,13 @@
 
 build ()
 {
+    
+    # [ -n "${APPENDBOOTMESSAGE}" ] && export APPENDBOOTMESSAGE
+    # [ -n "${APPENDOPTIONSBOOTMESSAGE}" ] && export APPENDOPTIONSBOOTMESSAGE
+    
+    # [ "${BOOTMESSAGE}" = "" ] && export BOOTMESSAGE=$(mktemp /tmp/bootmessage.XXXX)
+    # [ "${OPTIONSBOOTMESSAGE}" = "" ] && export OPTIONSBOOTMESSAGE=$(mktemp /tmp/optionsbootmessage.XXXX)
+    
     ### generate boot.msg
     [ "${RUNPROGRAM}" = "mkisolinux" ] && TITLEMSG="ISOLINUX"
     [ "${RUNPROGRAM}" = "mksyslinux" ] && TITLEMSG="SYSLINUX"
diff --git a/usr/lib/initcpio/install/arch_memtest b/usr/lib/initcpio/install/arch_memtest
index 23ad05c9f..0143d0b86 100644
--- a/usr/lib/initcpio/install/arch_memtest
+++ b/usr/lib/initcpio/install/arch_memtest
@@ -3,10 +3,10 @@
 
 build ()
 {
-    [ ${RUNPROGRAM}  = "mkisolinux" ] && cp "/boot/memtest86+/memtest.bin" "${TEMPDIR}/boot/memtest"
-    [ ${RUNPROGRAM}  = "archboot-tarball-helper.sh" ] && cp "/boot/memtest86+/memtest.bin" "${TEMPDIR}/boot/memtest"
-    [ ${RUNPROGRAM}  = "mksyslinux" ] && cp "/boot/memtest86+/memtest.bin" "${TEMPDIR}/boot/memtest"
-    [ ${RUNPROGRAM}  = "mkpxelinux" ] && cp "/boot/memtest86+/memtest.bin" "${INSTALLDIR}/memtest"
+    [ "${RUNPROGRAM}"  = "mkisolinux" ] && cp "/boot/memtest86+/memtest.bin" "${TEMPDIR}/boot/memtest"
+    [ "${RUNPROGRAM}"  = "archboot-tarball-helper.sh" ] && cp "/boot/memtest86+/memtest.bin" "${TEMPDIR}/boot/memtest"
+    [ "${RUNPROGRAM}"  = "mksyslinux" ] && cp "/boot/memtest86+/memtest.bin" "${TEMPDIR}/boot/memtest"
+    [ "${RUNPROGRAM}"  = "mkpxelinux" ] && cp "/boot/memtest86+/memtest.bin" "${INSTALLDIR}/memtest"
 }
 
 help ()
diff --git a/usr/lib/initcpio/install/arch_network_install b/usr/lib/initcpio/install/arch_network_install
index ef50b5923..2740407be 100644
--- a/usr/lib/initcpio/install/arch_network_install
+++ b/usr/lib/initcpio/install/arch_network_install
@@ -10,7 +10,7 @@ build ()
     fi
 
     ### check for TEMPDIR
-    if [ $TEMPDIR = "" ]; then
+    if [ "$TEMPDIR" = "" ]; then
 	 echo "ERROR: No TEMPDIR was set, please set TEMPDIR first!"
 	 exit 1
     fi