diff --git a/TODO b/TODO
index f780b0b..25d3a87 100644
--- a/TODO
+++ b/TODO
@@ -1,7 +1,5 @@
-- root authorized_keys support
 - zfs support
   - start systemd services
   - create pool
   - enable zstd
-- systemd settings pls
 - zfs selector dracut
diff --git a/scripts/functions.sh b/scripts/functions.sh
index a4e5d1e..908c65a 100644
--- a/scripts/functions.sh
+++ b/scripts/functions.sh
@@ -287,7 +287,7 @@ function disk_create_luks() {
 			--header-backup-file "$header_file" \
 		|| die "Could not backup luks header on $device_desc"
 	cryptsetup open --type luks2 \
-			--key-file "$keyfile" \
+			--key-file <(echo -n "$GENTOO_INSTALL_ENCRYPTION_KEY") \
 			"$device" "$name" \
 		|| die "Could not open luks encrypted device $device_desc"
 }
diff --git a/scripts/main.sh b/scripts/main.sh
index 4324e71..5f9c37c 100644
--- a/scripts/main.sh
+++ b/scripts/main.sh
@@ -36,32 +36,14 @@ function configure_base_system() {
 		echo "KEYMAP=$KEYMAP" > /etc/vconsole.conf \
 			|| die "Could not write /etc/vconsole.conf"
 
+		# Set locale
+		einfo "Selecting locale"
+		echo "LANG=$LOCALE" > /etc/locale.conf \
+			|| die "Could not write /etc/locale.conf"
+
 		einfo "Selecting timezone"
 		ln -sfn "../usr/share/zoneinfo/$TIMEZONE" /etc/localtime \
 			|| die "Could not change /etc/localtime link"
-
-		# TODO use systemd-nspawn to start instead of chroot, then we can use these utils.
-		#hostnamectl set-hostname "$HOSTNAME" \
-		#	|| die "Could not set hostname"
-
-		## Set timezone
-		#einfo "Selecting timezone"
-		#timedatectl set-timezone "$TIMEZONE" \
-		#	|| die "Could not set timezone"
-
-		#einfo "Setting time to UTC"
-		#timedatectl set-local-rtc 0 \
-		#	|| die "Could not set local rtc to UTC"
-
-		## Set keymap
-		#einfo "Selecting keymap"
-		#localectl set-keymap "$KEYMAP" \
-		#	|| die "Could not set keymap"
-
-		## Set locale
-		#einfo "Selecting locale"
-		#localectl set-locale LANG="$LOCALE" \
-		#	|| die "Could not set locale"
 	else
 		# Set hostname
 		einfo "Selecting hostname"