diff --git a/.config/fish/functions/kak-session.fish b/.config/fish/functions/kak-session.fish
index 257ea785..68112792 100644
--- a/.config/fish/functions/kak-session.fish
+++ b/.config/fish/functions/kak-session.fish
@@ -49,18 +49,18 @@ function kak-session -w kak --description "kakoune where sessions are derived fr
             mkfifo "$fifo"
 
             if not set -gq nokakdaemon
-            setsid kak -d -s "$session_id" -E "cd %[$kakroot]; echo -to-file $fifo ready" &
+                setsid kak -d -s "$session_id" -E "cd %[$kakroot]; echo -to-file $fifo ready" &
+
+                # once $fifo has data, the kakoune server has initialized.
+                cat $fifo >/dev/null
+
+                command rm -r "$fifo_dir"
+                command kak -c "$session_id" $flags $files
             else
-            setsid kak -s "$session_id" -E "cd %[$kakroot]; echo -to-file $fifo ready" &
+                command kak -s "$session_id" -e "cd %[$kakroot]" $flags $files
             end
-
-            # once $fifo has data, the kakoune server has initialized.
-            cat $fifo >/dev/null
-
-            command rm -r "$fifo_dir"
         end
 
-        command kak -c "$session_id" $flags $files
     else if [ -n "$git_dir" ]
         # when in a git directory, share sessions
         # the shared session id is {repo}__{branch} where repo is the remote repo name
@@ -81,18 +81,14 @@ function kak-session -w kak --description "kakoune where sessions are derived fr
             mkfifo "$fifo"
 
             if not set -gq nokakdaemon
-            setsid kak -d -s "$session_id" -E "cd %[$git_dir]; echo -to-file $fifo ready" &
+                setsid kak -d -s "$session_id" -E "cd %[$git_dir]; echo -to-file $fifo ready" &
+                cat $fifo >/dev/null
+                command rm -r "$fifo_dir"
+                command kak -c "$session_id" -e 'try%{ delete-buffer *scratch* }' $flags $files
             else
-            setsid kak -s "$session_id" -E "cd %[$git_dir]; echo -to-file $fifo ready" &
+                command kak -s "$session_id" -e "cd %[$git_dir]" $flags $files
             end
-
-            # once $fifo has data, the kakoune server has initialized.
-            cat $fifo >/dev/null
-
-            command rm -r "$fifo_dir"
         end
-
-        command kak -c "$session_id" $flags $files
     else
         command kak $flags $files
     end
diff --git a/.config/fish/functions/kakl.fish b/.config/fish/functions/kakl.fish
new file mode 100644
index 00000000..c0d01e1c
--- /dev/null
+++ b/.config/fish/functions/kakl.fish
@@ -0,0 +1,4 @@
+function kakl --wraps='kak -l' --description 'alias kakl=kak -l'
+  kak -l $argv
+        
+end
diff --git a/.config/fish/functions/kakrc.fish b/.config/fish/functions/kakrc.fish
index 993cb9f8..c7e387aa 100644
--- a/.config/fish/functions/kakrc.fish
+++ b/.config/fish/functions/kakrc.fish
@@ -1,6 +1,5 @@
 function kakrc --description "Edit kakrc. -c to force a new session."
     if test "$argv[1]" != -c || test "$argv[1]" != new
-        # set -g nokakdaemon
         kak-session ~/.config/kak/kakrc
     else
         kak -e 'cd ~/.config/kak' ~/.config/kak/kakrc