diff --git a/arch-install b/arch-install
index aebb2b6..ed5f704 100755
--- a/arch-install
+++ b/arch-install
@@ -63,7 +63,7 @@ function minimalinstallation() {
   cp /opt/${repo}/aurinstall.sh ${mountpoint}/usr/bin/aurinstaller
   chmod +x ${mountpoint}/usr/bin/aurinstaller
 
-  if [ "y" != "noinstall" ]; then
+  if [ "y" != "${noinstall}" ]; then
     echo "${name}´s_PC-${version}" > ${mountpoint}/etc/hostname
   fi
 
@@ -308,14 +308,14 @@ function installation {
 
   #boot
   echo "format"
-  if [ "y" != "noinstall" ] && [ "${skipbootpartition}" != "y" ]; then
+  if [ "y" != "${noinstall}" ] && [ "${skipbootpartition}" != "y" ]; then
     mkfs.vfat -F 32 ${device}${efipartitionnummer}
   fi
 
   #root
   if [ "${dateisystem}" == "btrfs" ]; then
     #mkfs.btrfs -f -L p_arch ${device}2
-    if [ "y" != "noinstall" ]; then
+    if [ "y" != "${noinstall}" ]; then
       btrfsformat #btrfs
     fi
     subvolume #btrfs
@@ -323,12 +323,12 @@ function installation {
   elif [ "${dateisystem}" == "ext4" ]; then
     echo "confirm with y"
     if [ "${verschluesselung}" == "y" ]; then
-      if [ "y" != "noinstall" ]; then
+      if [ "y" != "${noinstall}" ]; then
         mkfs.ext4 -L p_arch ${deviceluks} #ext4
       fi
       mount ${deviceluks} ${mountpoint}
     else
-      if [ "y" != "noinstall" ]; then
+      if [ "y" != "${noinstall}" ]; then
         mkfs.ext4 -L p_arch ${device}${rootpartitionnummer} #ext4
       fi
       mount ${device}${rootpartitionnummer} ${mountpoint}
@@ -338,14 +338,14 @@ function installation {
   fi
 
   #swap
-  if [ "y" != "noinstall" ]; then
+  if [ "y" != "${noinstall}" ]; then
     if [ "${swap}" != "n" ]; then
       mkswap -L p_swap ${device}${swappartitionnummer}
     fi
   fi
 
   #installation
-  if [ "y" != "noinstall" ]; then
+  if [ "y" != "${noinstall}" ]; then
     if [ "${offline}" != "n" ]
     then
       if [ -f /run/archiso/bootmnt/arch/$(uname -m)/airootfs.sfs ]; then
@@ -464,7 +464,7 @@ function installation {
   fi
 
   #makeswapfile+fstab
-  if [ "y" != "noinstall" ]; then
+  if [ "y" != "${noinstall}" ]; then
     if [ "${swapfile}" == "y" ]; then
       if [ "${dateisystem}" == "btrfs" ]; then
         makebtrfsswapfile
@@ -474,18 +474,18 @@ function installation {
     fi
   fi
 
-  if [ "y" != "noinstall" ]; then
+  if [ "y" != "${noinstall}" ]; then
     #hostname
     echo "${name}´s_PC-${version}" > ${mountpoint}/etc/hostname
   fi
 
-  if [ "y" != "noinstall" ]; then
+  if [ "y" != "${noinstall}" ]; then
     if [ "${usbsecret}" == "y" ]; then
       usbsecret
     fi
   fi
 
-  if [ "y" != "noinstall" ]; then
+  if [ "y" != "${noinstall}" ]; then
     if [ "${usbkey}" == "y" ]; then
       usbkeyinstallation
     fi
@@ -699,7 +699,7 @@ function subvolume() {
   btrfsmount 1
 
   # Create
-  if [ "y" != "noinstall" ]; then
+  if [ "y" != "${noinstall}" ]; then
     mkdir -p /mnt/btrfs-root/__snapshot
     mkdir -p /mnt/btrfs-root/__current
     btrfs subvolume create /mnt/btrfs-root/__current/ROOT
@@ -1151,7 +1151,7 @@ abfrage
 
 secureumount
 
-if [ "y" == "debug" ] || [ "y" == "noinstall" ]
+if [ "y" == "${debug}" ] || [ "y" == "${noinstall}" ]
 then
   echo "DEBEUG-MODUS"
   echo "If no more commands are required, simply press enter"
@@ -1169,7 +1169,7 @@ fi
 #
 echo "A purge stops the chance of installing on the system."
 echo "It may take a while!"
-if [ "y" != "noinstall" ] && [ "y" != "${skipbootpartition}" ]; then
+if [ "y" != "${noinstall}" ] && [ "y" != "${skipbootpartition}" ]; then
   sleep 5
   dd if=/dev/zero of=${device} bs=64M count=10 status=progress
 fi
@@ -1212,7 +1212,7 @@ then
   else
     systemdboot
   fi
-  #removeinstaller
+  removeinstaller
   echo "Finished"
 elif [ "${Partition}" == "bios" ]; then
   echo "Partitions with MBR"
@@ -1245,7 +1245,7 @@ elif [ "${Partition}" == "bios" ]; then
   echo ""
   arch-chroot ${mountpoint} grub-install --target=i386-pc --recheck ${device}
   arch-chroot ${mountpoint} grub-mkconfig -o /boot/grub/grub.cfg
-  #removeinstaller
+  removeinstaller
   echo "Finished"
 else
   echo "Entry Invalid"
@@ -1262,7 +1262,7 @@ fi
 
 # benutzerwechsel
 
-if [ "y" != "noinstall" ] && [ -z "${installationsfehler}" ]; then
+if [ "y" != "${noinstall}" ] && [ -z "${installationsfehler}" ]; then
   #arch-chroot ${mountpoint} usermod -l "${name}" user1
   #arch-chroot ${mountpoint} usermod -d /home/"${name}" -m "${name}"
   arch-chroot ${mountpoint} chfn -f "${name}" user1