diff --git a/setup.sh b/setup.sh
index 7e84e8b..9cdc7f0 100644
--- a/setup.sh
+++ b/setup.sh
@@ -242,12 +242,12 @@ echo "cp /usr/share/zoneinfo/$timezone /etc/localtime" >> /mnt/setup-chroot.sh
 echo "echo \"Done.\"" >> /mnt/setup-chroot.sh
 
 echo "echo \"\"" >> /mnt/setup-chroot.sh
-echo "echo \"Installing linux image, bash, screen, tmux, zfs, vim, sharutils, docker, dosfstools, mailutils, openssh, bridge-utils, net-utils, ufw...\"" >> /mnt/setup-chroot.sh
+echo "echo \"Installing linux image, bash, screen, tmux, zfs, vim, sharutils, docker, dnsutils, dosfstools, mailutils, openssh, bridge-utils, net-utils, ufw...\"" >> /mnt/setup-chroot.sh
 
 # preconfigure postfix for no configuration
 #echo "debconf-set-selections <<< \"postfix postfix/main_mailer_type string 'No configuration'\"" >> /mnt/setup-chroot.sh
 #echo "debconf-set-selections <<< \"postfix postfix/mailname string $hostname\"" >> /mnt/setup-chroot.sh
-echo "errors=\$(DEBCONF_FRONTEND='noninteractive' apt install -y --no-install-recommends linux-image-generic 2>&1 1>/dev/null && apt purge -y netplan 2>&1 1>/dev/null && DEBCONF_FRONTEND='noninteractive' apt install -y ifupdown vim bridge-utils net-tools bash screen tmux zfs-initramfs dosfstools openssh-server ufw sendmail mailutils docker.io sharutils 2>&1 1>/dev/null)" >> /mnt/setup-chroot.sh
+echo "errors=\$(DEBCONF_FRONTEND='noninteractive' apt install -y --no-install-recommends linux-image-generic 2>&1 1>/dev/null && apt purge -y netplan 2>&1 1>/dev/null && DEBCONF_FRONTEND='noninteractive' apt install -y ifupdown dnsutils vim bridge-utils net-tools bash screen tmux zfs-initramfs dosfstools openssh-server ufw sendmail mailutils docker.io sharutils 2>&1 1>/dev/null)" >> /mnt/setup-chroot.sh
 
 #echo "DEBCONF_FRONTEND='noninteractive' apt install -y --no-install-recommends linux-image-generic && apt install -y vim bash screen tmux zfs-initramfs dosfstools openssh-server ufw sendmail mailutils docker.io sharutils" >> /mnt/setup-chroot.sh
 
@@ -405,7 +405,7 @@ echo 'echo "Creating admin user..."'>> /mnt/setup-chroot.sh
 echo "useradd $admin" >> /mnt/setup-chroot.sh
 echo "cp -a /etc/skel/.[!.]* \"/home/$admin\"" >> /mnt/setup-chroot.sh
 echo "chown -R ${admin}:${admin} \"/home/$admin\"" >> /mnt/setup-chroot.sh
-echo "usermod -a -G adm,cdrom,dip,plugdev,sudo \"$admin\"" >> /mnt/setup-chroot.sh
+echo "usermod -a -G adm,cdrom,dip,plugdev,sudo -s /bin/bash \"$admin\"" >> /mnt/setup-chroot.sh
 echo "echo '${admin}:${rootpassword}' | chpasswd" >> /mnt/setup-chroot.sh
 echo 'echo "Done."'>> /mnt/setup-chroot.sh
 
@@ -430,6 +430,7 @@ echo "HOSTNAME=\"$hostname\"" >> /mnt/setup-chroot.sh
 echo "service sendmail start" >> /mnt/setup-chroot.sh
 echo "cat \"/home/${admin}/.ssh/id_rsa.pub\" | mail -s \"$hostname SSH key\" -A \"/home/${admin}/.ssh/id_rsa.pub\" admin" >> /mnt/setup-chroot.sh
 # uuencode test.csv test.csv | mail -v -s "Subject test" -r no-reply@mydomain.co.uk recepient@mydomain.co.uk
+#echo "sendmail -OTimeout.hoststatus=0m -q -v" >> /mnt/setup-chroot.sh
 
 echo "service sendmail stop" >> /mnt/setup-chroot.sh
 
@@ -471,8 +472,8 @@ echo "source-directory /etc/network/interfaces.d" > /mnt/etc/network/interfaces
 echo "Done."
 
 echo "echo \"\"" >> /mnt/setup-chroot.sh
-echo "echo \"Enabling UFW on boot...\"" >> /mnt/setup-chroot.sh
-echo "errors=\$(systemctl enable ufw 2>&1 1>/dev/null)" >> /mnt/setup-chroot.sh
+echo "echo \"Enabling UFW and apparmor on boot...\"" >> /mnt/setup-chroot.sh
+echo "errors=\$(systemctl enable ufw 2>&1 1>/dev/null && systemctl enable apparmor 2>&1 1>/dev/null)" >> /mnt/setup-chroot.sh
 echo 'if ! [ "$?" = "0" ]; then '>> /mnt/setup-chroot.sh
 echo '	echo "Failed to enable UFW - $errors"' >> /mnt/setup-chroot.sh
 echo "	exit 1">> /mnt/setup-chroot.sh