diff --git a/archinstall.sh b/archinstall.sh
index 56f1b85..4623793 100755
--- a/archinstall.sh
+++ b/archinstall.sh
@@ -23,8 +23,8 @@ MACADDRS=(
 DISK="/dev/vda"
 HOSTNAME="arch-testing"
 USER="clc"
-PASSWD="$1$8nWcCPFE$SMC36PPfImzmQ9E3WEPvy1"
-ROOTPASSWD="$1$8g0M2I8t$GNnx5EkVhu1Ykw7NuKZos."
+PASSWD="notareallpass"
+ROOTPASSWD="needssalt"
 
 #Echo text with a color passed as the second arguement
 echoc () {
@@ -95,15 +95,11 @@ sysinstall () {
     pacstrap /mnt base base-devel linux linux-firmware nano 
 
     echoc " - Installing bootloader." $GREEN
-    arch-chroot /mnt pacman -Syy grub efibootmgr os-prober
+    arch-chroot /mnt pacman -Sy --noconfirm grub efibootmgr os-prober
     echo "GRUB_DISABLE_OS_PROBER=false" > /mnt/etc/default/grub
     arch-chroot /mnt grub-install --target=x86_64-efi --efi-directory=/boot --bootloader-id=GRUB
     arch-chroot /mnt grub-mkconfig -o /boot/grub/grub.cfg
 
-    #arch-chroot /mnt bootctl install
-    #echo "default arch timeout 4" > /mnt/boot/loader/loader.conf
-    #echo "title Arch Linux linux /vmlinuz-linux initrd /initramfs-linux.img options root=PARTUUID=$(blkid -s PARTUUID -o value "$part_root") rw" > /mnt/boot/loader/entries/arch.conf
-
     echoc " - Updating fstab." $GREEN
     genfstab -t PARTUUID /mnt >> /mnt/etc/fstab
 
@@ -113,8 +109,8 @@ sysinstall () {
     arch-chroot /mnt useradd -mU -s /bin/bash -G wheel,uucp,video,audio,storage,games,input $USER
     arch-chroot /mnt chsh -s /bin/bash
 
-    echo "$USER:$PASSWD" | chpasswd -e --root /mnt
-    echo "root:$ROOTPASSWD" | chpasswd -e --root /mnt
+    echo "$USER:$PASSWD" | arch-chroot /mnt chpasswd -e 
+    echo "root:$ROOTPASSWD" | arch-chroot /mnt chpasswd -e 
 }
 
 ######################################################################################