diff --git a/1-setup.sh b/1-setup.sh
index bac4fa0..dd6e22c 100755
--- a/1-setup.sh
+++ b/1-setup.sh
@@ -198,14 +198,14 @@ uefi)
         echo "Installing efistub"
         install_pkg efibootmgr
         if [[ "$LUKS" -eq 1 ]]; then
-            efibootmgr --disk "$DISK" --part 1 --create --label "ArchTitus" --loader "/vmlinuz-linux" --unicode "cryptdevice=PARTUUID=$PART_UUID:luks:allow-discards root=/dev/$LVM_VG/${LVM_NAMES[0]} rw initrd=\\$IMG initrd=\initramfs-linux.img"
             efibootmgr --disk "$DISK" --part 1 --create --label "ArchTitus-Fallback" --loader "/vmlinuz-linux" --unicode "cryptdevice=PARTUUID=$PART_UUID:luks:allow-discards root=/dev/$LVM_VG/${LVM_NAMES[0]} rw initrd=\\$IMG initrd=\initramfs-linux-fallback.img"
+            efibootmgr --disk "$DISK" --part 1 --create --label "ArchTitus" --loader "/vmlinuz-linux" --unicode "cryptdevice=PARTUUID=$PART_UUID:luks:allow-discards root=/dev/$LVM_VG/${LVM_NAMES[0]} rw initrd=\\$IMG initrd=\initramfs-linux.img"
         elif [[ "$LVM" -eq 1 ]]; then
-            efibootmgr --disk "$DISK" --part 1 --create --label "ArchTitus" --loader "/vmlinuz-linux" --unicode "root=/dev/$LVM_VG/${LVM_NAMES[0]} rw initrd=\\$IMG initrd=\initramfs-linux.img"
             efibootmgr --disk "$DISK" --part 1 --create --label "ArchTitus-Fallback" --loader "/vmlinuz-linux" --unicode "root=/dev/$LVM_VG/${LVM_NAMES[0]} rw initrd=\\$IMG initrd=\initramfs-linux-fallback.img"
+            efibootmgr --disk "$DISK" --part 1 --create --label "ArchTitus" --loader "/vmlinuz-linux" --unicode "root=/dev/$LVM_VG/${LVM_NAMES[0]} rw initrd=\\$IMG initrd=\initramfs-linux.img"
         else
-            efibootmgr --disk "$DISK" --part 1 --create --label "ArchTitus" --loader "/vmlinuz-linux" --unicode "root=PARTUUID=$PART_UUID rw initrd=\\$IMG initrd=\initramfs-linux.img"
             efibootmgr --disk "$DISK" --part 1 --create --label "ArchTitus-Fallback" --loader "/vmlinuz-linux" --unicode "root=PARTUUID=$PART_UUID rw initrd=\\$IMG initrd=\initramfs-linux-fallback.img"
+            efibootmgr --disk "$DISK" --part 1 --create --label "ArchTitus" --loader "/vmlinuz-linux" --unicode "root=PARTUUID=$PART_UUID rw initrd=\\$IMG initrd=\initramfs-linux.img"
         fi
     else
         echo "ERROR! efistub is not supported for BIOS systems"
diff --git a/2-user.sh b/2-user.sh
index 0fc426a..81e1137 100755
--- a/2-user.sh
+++ b/2-user.sh
@@ -19,7 +19,7 @@ install_aur() {
     "$AURHELPER" -S --noconfirm --needed "$@"
 }
 
-cd ~ || exit 0
+cd "$HOME" || exit 0
 case "$AURHELPER" in
 "yay")
     install_pkg "go"
@@ -46,7 +46,7 @@ esac
 
 cd "$AURHELPER" || exit 0
 makepkg -si --noconfirm
-cd ~ || exit 0
+cd "$HOME" || exit 0
 
 
 if [[ "$LAYOUT" -eq 1 ]]; then
@@ -54,7 +54,7 @@ if [[ "$LAYOUT" -eq 1 ]]; then
             echo "INSTALLING: $LINE"
             install_aur "$LINE"
     done <~/ArchTitus/pkg-files/aur-pkgs.txt
-    
+
     touch "$HOME/.cache/zshhistory"
     git clone "https://github.com/ChrisTitusTech/zsh"
     git clone --depth=1 "https://github.com/romkatv/powerlevel10k.git" "$HOME"/powerlevel10k
@@ -80,6 +80,6 @@ case "$DESKTOP" in
     ;;
 esac
 
-export PATH=$PATH:~/.local/bin
+export PATH=$PATH:$HOME/.local/bin
 
 title "System ready for 3-post-setup.sh"
diff --git a/archtitus.sh b/archtitus.sh
index 24907c4..54bf148 100755
--- a/archtitus.sh
+++ b/archtitus.sh
@@ -29,6 +29,12 @@ logo() {
 
 do_reboot () {
     cp "$LOG" "$MOUNTPOINT"/var/log/archtitus.log
+    if [[ "$LVM" -eq 1 || "$LUKS" -eq 1 ]]; then
+        i=0
+        while [[ "$i" -le "${#LVM_NAMES[@]}" ]]; do
+            umount -l /dev/"$LVM_VG"/"${LVM_NAMES[$i]}"
+        done
+    fi
     umount -R "$MOUNTPOINT"/boot
     umount -R "$MOUNTPOINT"
     reboot
@@ -43,16 +49,18 @@ end() {
             continue
         fi
         if [[ "$KEY" == $'\e' ]]; then
+            REBOOT=0
             break
         elif [[ "$KEY" == "r" || "$KEY" == "R" ]]; then
             REBOOT=1
             break
         fi
+        REBOOT=1
     done
     if [[ "$REBOOT" -eq 1 ]]; then
         do_reboot
     else
-        echo "Aborted"
+        echo "Reboot is aborted "
     fi
 }