diff --git a/etc/ssh/sshd_config b/etc/ssh/sshd_config
new file mode 100644
index 0000000..04cf120
--- /dev/null
+++ b/etc/ssh/sshd_config
@@ -0,0 +1,11 @@
+AllowUsers PLACEHOLDER
+AuthenticationMethods publickey,password
+Ciphers aes256-gcm@openssh.com
+Compression no
+HostKey /etc/ssh/ssh_host_ed25519_key
+HostKeyAlgorithms ssh-ed25519
+KexAlgorithms mlkem768x25519-sha256
+MACs umac-128-etm@openssh.com
+PermitRootLogin no
+PubkeyAcceptedAlgorithms ssh-ed25519
+Subsystem sftp internal-sftp
diff --git a/etc/sysctl.d/90-bbr.conf b/etc/sysctl.d/90-bbr.conf
new file mode 100644
index 0000000..a3696f8
--- /dev/null
+++ b/etc/sysctl.d/90-bbr.conf
@@ -0,0 +1 @@
+net.ipv4.tcp_congestion_control = bbr
diff --git a/etc/systemd/network/50-default-ether.network b/etc/systemd/network/50-default-ether.network
new file mode 100644
index 0000000..d828b5f
--- /dev/null
+++ b/etc/systemd/network/50-default-ether.network
@@ -0,0 +1,16 @@
+[Match]
+Type=ether
+
+[Link]
+RequiredForOnline=routable
+
+[Network]
+DHCP=yes
+IPv6AcceptRA=yes
+EmitLLDP=yes
+
+[DHCPv4]
+RouteMetric=100
+
+[IPv6AcceptRA]
+RouteMetric=100
diff --git a/etc/systemd/network/50-default-wlan.network b/etc/systemd/network/50-default-wlan.network
new file mode 100644
index 0000000..6ca05c4
--- /dev/null
+++ b/etc/systemd/network/50-default-wlan.network
@@ -0,0 +1,19 @@
+[Match]
+Type=wlan
+WLANInterfaceType=station
+SSID=*
+
+[Link]
+RequiredForOnline=routable
+
+[Network]
+DHCP=yes
+IPv6AcceptRA=yes
+IgnoreCarrierLoss=3s
+EmitLLDP=yes
+
+[DHCPv4]
+RouteMetric=200
+
+[IPv6AcceptRA]
+RouteMetric=200
diff --git a/etc/systemd/resolved.conf.d/90-no-fallbackdns.conf b/etc/systemd/resolved.conf.d/90-no-fallbackdns.conf
new file mode 100644
index 0000000..2d26673
--- /dev/null
+++ b/etc/systemd/resolved.conf.d/90-no-fallbackdns.conf
@@ -0,0 +1,2 @@
+[Resolve]
+FallbackDNS=
diff --git a/etc/systemd/resolved.conf.d/90-no-llmnr.conf b/etc/systemd/resolved.conf.d/90-no-llmnr.conf
new file mode 100644
index 0000000..ad4ea0b
--- /dev/null
+++ b/etc/systemd/resolved.conf.d/90-no-llmnr.conf
@@ -0,0 +1,2 @@
+[Resolve]
+LLMNR=no
diff --git a/etc/systemd/resolved.conf.d/90-no-mdns.conf b/etc/systemd/resolved.conf.d/90-no-mdns.conf
new file mode 100644
index 0000000..523ed7c
--- /dev/null
+++ b/etc/systemd/resolved.conf.d/90-no-mdns.conf
@@ -0,0 +1,2 @@
+[Resolve]
+MulticastDNS=no
diff --git a/install-arch-linux.sh b/install-arch-linux.sh
index 3c60b53..8f81ba9 100755
--- a/install-arch-linux.sh
+++ b/install-arch-linux.sh
@@ -139,7 +139,7 @@ fi
 
 ## Arch Linux Installation Guide Step 3.1 - Fstab
 print "Generating /etc/fstab..."
-genfstab -U /mnt >>/mnt/etc/fstab
+genfstab -U /mnt >> /mnt/etc/fstab
 
 ## Arch Linux Installation Guide Step 3.4 - Localization
 print "Setting up locale..."
@@ -193,55 +193,16 @@ arch-chroot /mnt passwd $username
 print "Installing default configuration files..."
 cp -r ./etc /mnt
 
-print "Setting up systemd-resolved..."
-arch-chroot /mnt sed -i "s|^#MulticastDNS=yes|MulticastDNS=no|" /etc/systemd/resolved.conf
-arch-chroot /mnt sed -i "s|^#LLMNR=yes|LLMNR=no|" /etc/systemd/resolved.conf
+print "Enabling systemd-resolved..."
 arch-chroot /mnt systemctl enable systemd-resolved.service
 ln -sf ../run/systemd/resolve/stub-resolv.conf /mnt/etc/resolv.conf
 
-print "Setting up systemd-networkd..."
-arch-chroot /mnt sh -c "cat > /etc/systemd/network/50-default-ether.network" <<EOF
-[Match]
-Type=ether
-
-[Link]
-RequiredForOnline=routable
-
-[Network]
-DHCP=yes
-IPv6AcceptRA=yes
-EmitLLDP=yes
-
-[DHCPv4]
-RouteMetric=100
-
-[IPv6AcceptRA]
-RouteMetric=100
-EOF
-
-arch-chroot /mnt sh -c "cat > /etc/systemd/network/50-default-wlan.network" <<EOF
-[Match]
-Type=wlan
-WLANInterfaceType=station
-SSID=*
-
-[Link]
-RequiredForOnline=routable
-
-[Network]
-DHCP=yes
-IPv6AcceptRA=yes
-IgnoreCarrierLoss=3s
-EmitLLDP=yes
-
-[DHCPv4]
-RouteMetric=200
-
-[IPv6AcceptRA]
-RouteMetric=200
-EOF
+print "Enabling systemd-networkd..."
 arch-chroot /mnt systemctl enable systemd-networkd.service
 
+print "Enabling systemd-timesyncd..."
+arch-chroot /mnt systemctl enable systemd-timesyncd.service
+
 print "Enabling nftables firewall..."
 arch-chroot /mnt systemctl enable nftables.service
 
@@ -250,35 +211,15 @@ read install_iwd
 
 if [ "$install_iwd" == "y" ]; then
 	print "Installing iwd..."
-    arch-chroot /mnt pacman --noconfirm -S iwd
+	arch-chroot /mnt pacman --noconfirm -S iwd
 	arch-chroot /mnt systemctl enable iwd.service
 fi
 
-print "Enabling systemd-timesyncd..."
-arch-chroot /mnt systemctl enable systemd-timesyncd.service
-
 print "Setting up and enabling OpenSSH server..."
-arch-chroot /mnt sh -c "cat > /etc/ssh/sshd_config" <<EOF
-AllowUsers $username
-AuthenticationMethods publickey,password
-Ciphers aes256-gcm@openssh.com
-Compression no
-HostKey /etc/ssh/ssh_host_ed25519_key
-HostKeyAlgorithms ssh-ed25519
-KexAlgorithms mlkem768x25519-sha256
-MACs umac-128-etm@openssh.com
-PermitRootLogin no
-PubkeyAcceptedAlgorithms ssh-ed25519
-Subsystem sftp internal-sftp
-EOF
+arch-chroot /mnt sed -i "s|PLACEHOLDER|${username}|" /etc/ssh/sshd_config
 arch-chroot /mnt ssh-keygen -t ed25519 -C "" -N "" -f /etc/ssh/ssh_host_ed25519_key
 arch-chroot /mnt systemctl enable sshd.service
 
-print "Setting up BBR congestion control..."
-arch-chroot /mnt sh -c "cat > /etc/sysctl.d/70-bbr.conf" <<EOF
-net.ipv4.tcp_congestion_control = bbr
-EOF
-
 print "Adding LogalNet Internal Certification Authority to system CA store..."
 cp ./logalnet-internal-ca.crt /mnt
 arch-chroot /mnt trust anchor --store /logalnet-internal-ca.crt
@@ -374,7 +315,7 @@ print "         XFCE 4 with no additional applications."
 print " 4 - Home Theater PC"
 print "         XFCE 4 with Firefox and VLC media player."
 print " 5 - Home Theater PC with Gaming"
-print "         XFCE 4 with Firefox, VLC media playrer, and Dolphin."
+print "         XFCE 4 with Firefox, VLC media player, and Dolphin."
 print " 6 - Office Workstation"
 print "         XFCE 4 with a full suite of desktop applications aimed at general office work."
 print " 7 - Software Development Workstation"