diff --git a/setup.sh b/setup.sh
index 6e3a180..8c47a43 100644
--- a/setup.sh
+++ b/setup.sh
@@ -80,7 +80,7 @@ echo "Done."
 
 echo ""
 echo "Setting up main zpool dataset configuration..."
-errors=`zfs create -o canmount=off -o mountpoint=none rpool/ROOT 2>&1 1>/dev/null && zfs create -o canmount=off -o mountpoint=none bpool/BOOT 2>&1 1>/dev/null && zfs create -o canmount=noauto -o mountpoint=/ rpool/ROOT/ubuntu 2>&1 1>/dev/null && zfs mount rpool/ROOT/ubuntu 2>&1 1>/dev/null && zfs create -o canmount=noauto -o mountpoint=/boot bpool/BOOT/ubuntu 2>&1 1>/dev/null && zfs mount bpool/BOOT/ubuntu 2>&1 1>/dev/null && zfs create                                 rpool/home 2>&1 1>/dev/null && zfs create -o mountpoint=/root             rpool/home/root 2>&1 1>/dev/null && zfs create -o canmount=off                 rpool/var 2>&1 1>/dev/null && zfs create -o canmount=off                 rpool/var/lib 2>&1 1>/dev/null && zfs create                                 rpool/var/log 2>&1 1>/dev/null &&  zfs create                                 rpool/var/spool 2>&1 1>/dev/null && zfs create -o com.sun:auto-snapshot=false  rpool/var/cache 2>&1 1>/dev/null && zfs create -o com.sun:auto-snapshot=false  rpool/var/tmp 2>&1 1>/dev/null && chmod 1777 /mnt/var/tmp 2>&1 1>/dev/null && zfs create                                 rpool/opt 2>&1 1>/dev/null && zfs create                                 rpool/srv 2>&1 1>/dev/null && zfs create -o canmount=off                 rpool/usr 2>&1 1>/dev/null && zfs create                                 rpool/usr/local 2>&1 1>/dev/null && zfs create                                 rpool/var/mail 2>&1 1>/dev/null && zfs create -o com.sun:auto-snapshot=false  rpool/var/lib/docker 2>&1 1>/dev/null && zfs create -o com.sun:auto-snapshot=false  rpool/var/lib/nfs 2>&1 1>/dev/null && zfs create -o com.sun:auto-snapshot=false  rpool/tmp 2>&1 1>/dev/null && chmod 1777 /mnt/tmp 2>&1 1>/dev/null`
+errors=`zfs create -o canmount=noauto -o mountpoint=/ rpool/ROOT/ubuntu 2>&1 1>/dev/null && zfs mount rpool/ROOT/ubuntu 2>&1 1>/dev/null && zfs create -o canmount=noauto -o mountpoint=/boot bpool/BOOT/ubuntu 2>&1 1>/dev/null && zfs mount bpool/BOOT/ubuntu 2>&1 1>/dev/null && zfs create -o canmount=off -o mountpoint=none rpool/ROOT 2>&1 1>/dev/null && zfs create -o canmount=off -o mountpoint=none bpool/BOOT 2>&1 1>/dev/null && zfs create -o canmount=noauto -o mountpoint=/ rpool/ROOT/ubuntu 2>&1 1>/dev/null && zfs mount rpool/ROOT/ubuntu 2>&1 1>/dev/null && zfs create -o canmount=noauto -o mountpoint=/boot bpool/BOOT/ubuntu 2>&1 1>/dev/null && zfs mount bpool/BOOT/ubuntu 2>&1 1>/dev/null && zfs create                                 rpool/home 2>&1 1>/dev/null && zfs create -o mountpoint=/root             rpool/home/root 2>&1 1>/dev/null && zfs create -o canmount=off                 rpool/var 2>&1 1>/dev/null && zfs create -o canmount=off                 rpool/var/lib 2>&1 1>/dev/null && zfs create                                 rpool/var/log 2>&1 1>/dev/null &&  zfs create                                 rpool/var/spool 2>&1 1>/dev/null && zfs create -o com.sun:auto-snapshot=false  rpool/var/cache 2>&1 1>/dev/null && zfs create -o com.sun:auto-snapshot=false  rpool/var/tmp 2>&1 1>/dev/null && chmod 1777 /mnt/var/tmp 2>&1 1>/dev/null && zfs create                                 rpool/opt 2>&1 1>/dev/null && zfs create                                 rpool/srv 2>&1 1>/dev/null && zfs create -o canmount=off                 rpool/usr 2>&1 1>/dev/null && zfs create                                 rpool/usr/local 2>&1 1>/dev/null && zfs create                                 rpool/var/mail 2>&1 1>/dev/null && zfs create -o com.sun:auto-snapshot=false  rpool/var/lib/docker 2>&1 1>/dev/null && zfs create -o com.sun:auto-snapshot=false  rpool/var/lib/nfs 2>&1 1>/dev/null && zfs create -o com.sun:auto-snapshot=false  rpool/tmp 2>&1 1>/dev/null && chmod 1777 /mnt/tmp 2>&1 1>/dev/null`
 if ! [ "$?" = "0" ]; then 
 	echo "Error setting up ZFS settings - $errors"
 	exit 5
@@ -235,7 +235,7 @@ echo "update-grub">> /mnt/setup-chroot.sh
 i="0"
 for f in `echo "$disks"`; do
 	echo "grub-install --target=x86_64-efi --efi-directory=/boot/efi${i} --bootloader-id=ubuntu --recheck --no-floppy" >> /mnt/setup-chroot.sh
-	echo "umount /boot/efi\${i}" >> /mnt/setup-chroot.sh
+	echo "umount /boot/efi${i}" >> /mnt/setup-chroot.sh
 	i=$((i + 1))
 done