diff --git a/kitty/constants.py b/kitty/constants.py
index 2799ecfe8..711c1e4ce 100644
--- a/kitty/constants.py
+++ b/kitty/constants.py
@@ -79,6 +79,7 @@ def kitty_exe() -> str:
     return os.path.join(rpath, 'kitty')
 
 
+@run_once
 def kitten_exe() -> str:
     return os.path.join(os.path.dirname(kitty_exe()), 'kitten')
 
diff --git a/shell-integration/fish/vendor_conf.d/kitty-shell-integration.fish b/shell-integration/fish/vendor_conf.d/kitty-shell-integration.fish
index 76d7f85d7..66c216780 100644
--- a/shell-integration/fish/vendor_conf.d/kitty-shell-integration.fish
+++ b/shell-integration/fish/vendor_conf.d/kitty-shell-integration.fish
@@ -156,7 +156,7 @@ function __ksi_schedule --on-event fish_prompt -d "Setup kitty integration after
     end
 end
 
-function edit-in-kitty --wraps "kitten edit-in-kitty"
+function edit-in-kitty --wraps "kitten edit-in-kitty" -d "Edit the specified file in a kitty overlay window with your locally installed editor"
     kitten edit-in-kitty $argv
 end
 
diff --git a/tools/cmd/edit_in_kitty/main.go b/tools/cmd/edit_in_kitty/main.go
index 08c017e00..d0edaca8c 100644
--- a/tools/cmd/edit_in_kitty/main.go
+++ b/tools/cmd/edit_in_kitty/main.go
@@ -235,7 +235,7 @@ type Options struct {
 func EntryPoint(parent *cli.Command) *cli.Command {
 	sc := parent.AddSubCommand(&cli.Command{
 		Name:             "edit-in-kitty",
-		Usage:            "edit-in-kitty [options] file-to-edit",
+		Usage:            "[options] file-to-edit",
 		ShortDescription: "Edit a file in a kitty overlay window",
 		HelpText: "Edit the specified file in a kitty overlay window. Works over SSH as well.\n\n" +
 			"For usage instructions see: https://sw.kovidgoyal.net/kitty/shell-integration/#edit-file",
diff --git a/tools/cmd/tool/main.go b/tools/cmd/tool/main.go
index 380d22181..597c730f0 100644
--- a/tools/cmd/tool/main.go
+++ b/tools/cmd/tool/main.go
@@ -18,7 +18,7 @@ var _ = fmt.Print
 
 func KittyToolEntryPoints(root *cli.Command) {
 	root.Add(cli.OptionSpec{
-		Name: "--version", Type: "bool-set", Help: "The current kitty version."})
+		Name: "--version", Type: "bool-set", Help: "The current kitten version."})
 	// @
 	at.EntryPoint(root)
 	// update-self