diff --git a/Misc/Arch-LuksCrpy-Install.bash b/Misc/Arch-LuksCrpy-Install.bash
index 5f809a3..10f0f3f 100755
--- a/Misc/Arch-LuksCrpy-Install.bash
+++ b/Misc/Arch-LuksCrpy-Install.bash
@@ -297,8 +297,7 @@ install() {
   log "info" "Finished generating fstab"
   log "info" "Switching to new installation and finishing up install"
   arch-chroot /mnt << __END_CHROOT_CMDS__
-  echo Set your root password now
-  passwd
+  echo -e "toor\ntoor\n" | passwd
 
   echo "arch" > /etc/hostname
   cat << __EOF__ > "/etc/hosts"
@@ -315,9 +314,10 @@ __EOF__
   mkinitcpio -P
 
   yes | pacman -S grub efibootmgr intel-ucode amd-ucode
-  local disk_uuid
+  disk_uuid
   disk_uuid="$(blkid -s UUID -o value "${install_path}p2")"
-  sed 's/GRUB_CMDLINE_LINUX=.*/GRUB_CMDLINE_LINUX="cryptdevice=UUID=${disk_uuid}:cryptroot"'
+  echo "DISK UUID: ${disk_uuid}"
+  sed 's/GRUB_CMDLINE_LINUX=.*/GRUB_CMDLINE_LINUX="cryptdevice=UUID=${disk_uuid}:cryptroot"/'
   grub-install --target=x86_64-efi --efi-directory=/boot --bootloader-id=GRUB
   grub-mkconfig -o /boot/grub/grub.cfg