diff --git a/archlabs-installer b/archlabs-installer
index 2b94fb0..2df1347 100755
--- a/archlabs-installer
+++ b/archlabs-installer
@@ -1198,7 +1198,7 @@ install_main()
 			login      "${EDIT_FILES[login]}"
 
 		if [[ -z $choice || $choice == 'finished' ]]; then
-			[[ $DEBUG == true && -r $DBG ]] && $EDITOR $DBG
+			[[ $DEBUG == true && -r $DBG ]] && ${EDITOR:-vim} $DBG
 			clear && die 127
 		else
 			local exists=''
@@ -1206,7 +1206,7 @@ install_main()
 				[[ -e ${MNT}$f ]] && exists+=" ${MNT}$f"
 			done
 			if [[ $exists ]]; then
-				$EDITOR -O $exists
+				${EDITOR:-vim} -O $exists
 			else
 				msg "File Missing" "\nThe file(s) selected do not exist:\n\n${EDIT_FILES[$choice]}\n"
 			fi
@@ -1244,7 +1244,7 @@ install_base()
 		EOF
 	fi
 
-	[[ -e /run/archiso/sfs/airootfs && $KERNEL == 'linux' ]] && cp -vf $RUN/x86_64/vmlinuz $MNT/boot/vmlinuz-linux
+	[[ -e /run/archiso/sfs/airootfs ]] && cp -vf $RUN/x86_64/vmlinuz $MNT/boot/vmlinuz-linux
 	[[ -d /etc/netctl ]] && cp -rfv /etc/netctl $MNT/etc/
 	[[ -f /etc/resolv.conf ]] && cp -fv /etc/resolv.conf $MNT/etc/
 	[[ -e /etc/NetworkManager/system-connections ]] && cp -rvf /etc/NetworkManager/system-connections $MNT/etc/NetworkManager/
@@ -1427,8 +1427,6 @@ install_packages()
 		rmpkg+="zsh "
 	fi
 
-	[[ $KERNEL != 'linux' ]] && rmpkg+='linux '
-
 	if [[ $INSTALL_WMS == 'dwm' ]]; then # dwm only needs a very limited package set
 		inpkg+="nitrogen polkit-gnome gnome-keyring dunst "
 	else