diff --git a/extra/mirrorlist b/extra/mirrorlist
index ac24ffe..7cee237 100644
--- a/extra/mirrorlist
+++ b/extra/mirrorlist
@@ -1,7 +1,7 @@
-# Server list generated by rankmirrors on 2015-01-10
-Server = http://mirrors.advancedhosters.com/archlinux/$repo/os/$arch
+# Server list generated by rankmirrors on 2015-02-01
+Server = http://mirrors.acm.wpi.edu/archlinux/$repo/os/$arch
 Server = http://mirror.yellowfiber.net/archlinux/$repo/os/$arch
-Server = http://mirror.es.its.nyu.edu/archlinux/$repo/os/$arch
-Server = http://mirror.us.leaseweb.net/archlinux/$repo/os/$arch
-Server = http://mirrors.rutgers.edu/archlinux/$repo/os/$arch
+Server = http://mirrors.advancedhosters.com/archlinux/$repo/os/$arch
 Server = http://mirror.umd.edu/archlinux/$repo/os/$arch
+Server = http://mirror.jmu.edu/pub/archlinux/$repo/os/$arch
+Server = http://mirror.cs.pitt.edu/archlinux/$repo/os/$arch
diff --git a/extra/pre-build.d/etc/mkinitcpio.conf b/extra/pre-build.d/etc/mkinitcpio.conf
index a67317a..4d05b7a 100644
--- a/extra/pre-build.d/etc/mkinitcpio.conf
+++ b/extra/pre-build.d/etc/mkinitcpio.conf
@@ -3,7 +3,7 @@
 # run.  Advanced users may wish to specify all system modules
 # in this array.  For instance:
 #     MODULES="piix ide_disk reiserfs"
-MODULES="aufs ata_generic ata_piix loop nls_cp437 ext4 raid456 vfat netconsole"
+MODULES="overlay ata_generic ata_piix loop nls_cp437 ext4 raid456 vfat netconsole"
 
 # BINARIES
 # This setting includes any additional binaries a given user may
diff --git a/extra/pre-build.d/usr/lib/initcpio/hooks/livecd b/extra/pre-build.d/usr/lib/initcpio/hooks/livecd
index d583ea0..1b1f6b0 100644
--- a/extra/pre-build.d/usr/lib/initcpio/hooks/livecd
+++ b/extra/pre-build.d/usr/lib/initcpio/hooks/livecd
@@ -4,7 +4,7 @@ run_cleanuphook () {
         msg ":: Mounting OverlayFS on / with tmpfs=rw, ${root}=ro ..."
         modprobe overlay
 
-	echo "Now attempting aufs mount..."
+	echo "Now attempting overlay mount..."
 
 	mkdir /new_root.hw
 	mount --move /new_root /new_root.hw
diff --git a/extra/pre-build.d/usr/lib/initcpio/install/livecd b/extra/pre-build.d/usr/lib/initcpio/install/livecd
index 86299e8..4a0c57f 100644
--- a/extra/pre-build.d/usr/lib/initcpio/install/livecd
+++ b/extra/pre-build.d/usr/lib/initcpio/install/livecd
@@ -4,7 +4,6 @@ build()
 {
 	add_module 'squashfs'
 	add_module 'loop'
-	add_module 'aufs'
 	add_module 'overlay'
 
         add_binary "sed"
diff --git a/lib/10-mentos.func.sh b/lib/10-mentos.func.sh
index 44cbf86..6cf0728 100644
--- a/lib/10-mentos.func.sh
+++ b/lib/10-mentos.func.sh
@@ -40,7 +40,10 @@ function mentos {
     for x in $(find ${i}/etc/ -type f -iname "*.pacorig");do mv -f ${x} ${x%.pacorig} ; done
     ${CHROOTCMD} ${i}/ bash -c "${RACECAR_CHK}apacman --noconfirm --noedit --skipinteg -S --needed --ignore linux ${PKGLIST}" >> "${LOGFILE}.${FUNCNAME}" 2>&1
     for x in $(find ${i}/etc/ -type f -iname "*.pacorig");do mv -f ${x} ${x%.pacorig} ; done
+    ${CHROOTCMD} ${i}/ /usr/bin/bash -c "mkinitcpio -p linux" >> "${LOGFILE}.${FUNCNAME}" 2>&1
     #${CHROOTCMD} ${i}/ bash -c "apacman --noconfirm --noedit --skipinteg -S --needed ${PKGLIST}"
+    cp -a ${i}/boot/vmlinuz-linux ${i}/boot/vmlinuz-linux-${PNAME}
+    cp -a ${i}/boot/initramfs-linux.img ${i}/boot/initramfs-linux-${PNAME}.img
     echo "Done."
  done
  
diff --git a/lib/mk.chroot.sh b/lib/mk.chroot.sh
index 4f3cbb1..154eaf2 100755
--- a/lib/mk.chroot.sh
+++ b/lib/mk.chroot.sh
@@ -74,7 +74,8 @@ function mkchroot {
  cd "${BASEDIR}"
  
  ## Set some vars.
- MIRROR='http://mirrors.kernel.org/archlinux'
+ #MIRROR='http://mirrors.kernel.org/archlinux'
+ MIRROR='http://mirror.us.leaseweb.net/archlinux'
  RLSDIR="${MIRROR}/iso/latest"
  
  CURRLS64=$(curl -s ${RLSDIR}/sha1sums.txt | grep bootstrap | awk '{print $2}' | grep 'x86_64')
@@ -185,8 +186,7 @@ EOF
     mkdir -p ${i}/var/tmp/pkg
     cp ${BASEDIR}/extra/bootstrap/apacman* ${i}/var/tmp/pkg/apacman.tar.xz
     #${CHROOTCMD} ${i} "pacman --noconfirm -U /var/tmp/pkg/apacman.tar.xz" >> "${LOGFILE}.${FUNCNAME}" 2>&1
-    ${CHROOTCMD} ${i} bash -c "pacman --noconfirm -U /var/tmp/pkg/apacman.tar.xz" >> "${LOGFILE}.${FUNCNAME}" 2>&1
-    mkdir ${i}/var/tmp/apacman ; chmod 0750 ${i}/var/tmp/apacman ; chown 0:$(egrep '^aurbuild' ${i}/etc/group | cut -f3 -d":") ${i}/var/tmp/apacman
+    ${CHROOTCMD} ${i} bash -c "pacman --noconfirm -U /var/tmp/pkg/apacman.tar.xz && mkdir /var/tmp/apacman && chmod 0750 /var/tmp/apacman && chown root:aurbuild /var/tmp/apacman " >> "${LOGFILE}.${FUNCNAME}" 2>&1
     for x in $(find ${i}/etc/ -type f -iname "*.pacorig");do mv -f ${x} ${x%%.pacorig} ; done
     ${CHROOTCMD} ${i} bash -c "apacman -S --noconfirm --noedit --skipinteg -S apacman-deps expac" >> "${LOGFILE}.${FUNCNAME}" 2>&1
     #rm -rf ${i}/var/tmp/pkg
@@ -218,7 +218,7 @@ EOF
     for x in $(find ${i}/etc/ -type f -iname "*.pacorig");do mv -f ${x} ${x%%.pacorig} ; done
     set +e
     ${CHROOTCMD} ${i}/ /usr/bin/bash -c "apacman --noconfirm --noedit --skipinteg -S --needed linux" >> "${LOGFILE}.${FUNCNAME}" 2>&1
-    cp -a ${i}/boot/vmlinuz-linux ${i}/boot/vmlinuz/vmlinuz-linux-${PNAME}
+    cp -a ${i}/boot/vmlinuz-linux ${i}/boot/vmlinuz-linux-${PNAME}
     cp -a ${i}/boot/initramfs-linux.img ${i}/boot/initramfs-linux-${PNAME}.img
     set -e
     for x in $(find ${i}/etc/ -type f -iname "*.pacorig");do mv -f ${x} ${x%%.pacorig} ; done
@@ -265,7 +265,9 @@ EOF
  for i in ${CHROOTDIR32} ${CHROOTDIR64};
  do
   set +e
+  for x in $(find ${i}/etc/ -type f -iname "*.pacorig");do mv -f ${x} ${x%.pacorig} ; done
   ${CHROOTCMD} ${i}/ /usr/bin/bash -c "mkinitcpio -p linux" >> "${LOGFILE}.${FUNCNAME}" 2>&1
+  cp -a ${i}/boot/initramfs-linux.img ${i}/boot/initramfs-linux-${PNAME}.img
   set -e
  done