diff --git a/.xinitrc b/.xinitrc
index e5c659e..020a3f0 100644
--- a/.xinitrc
+++ b/.xinitrc
@@ -25,17 +25,16 @@ fi
 
 #== Thurstylark additions below ==#
 
+# Start ssh agent
+eval $(ssh-agent)
 
-eval $(/usr/bin/gnome-keyring-daemon --start --components=pkcs11,secrets,ssh)
-export SSH_AUTH_SOCK
-
-# Automatically lock after 30 minutes using slock
+# Automatically lock after 30 minutes using i3lock
 xautolock -time 30 -locker 'i3lock -b -d -c 000000 -e -f' &
 
 # Thurstybook-specific config:
 [ "$(hostname)" == "thurstybook" ] && srandrd ~/.config/srandrd.conf
 
-
+# dtarchaio-specific config:
 if [ "$(hostname)" == "dtarchaio" ]; then
 	# Set HDMI1 to be right of eDP1
 	xrandr --output eDP-1 --auto --output HDMI-1 --right-of eDP-1
@@ -45,13 +44,13 @@ if [ "$(hostname)" == "dtarchaio" ]; then
 	xinput --map-to-output $(xinput list --id-only "Advanced Silicon S.A CoolTouch(TM) System") eDP-1
 fi
 
-# If numlockx is installed, activate it
+# If numlockx is installed, turn numlock on
 [ -s /usr/bin/numlockx ] && numlockx on
 
 # Set termite up to launch tmux on $mod+Enter in i3
 export TERMINAL=~/.config/i3/launch-termite.sh
 
-
+# If $1 isn't set, use "i3"
 session=${1:-i3}
 
 case $session in