diff --git a/completers/fury_completer/cmd/accounts.go b/completers/fury_completer/cmd/accounts.go
index bf8f4c36db..061ce6d335 100644
--- a/completers/fury_completer/cmd/accounts.go
+++ b/completers/fury_completer/cmd/accounts.go
@@ -13,5 +13,6 @@ var accountsCmd = &cobra.Command{
 
 func init() {
 	carapace.Gen(accountsCmd).Standalone()
+
 	rootCmd.AddCommand(accountsCmd)
 }
diff --git a/completers/fury_completer/cmd/beta.go b/completers/fury_completer/cmd/beta.go
new file mode 100644
index 0000000000..aa0b7e62fd
--- /dev/null
+++ b/completers/fury_completer/cmd/beta.go
@@ -0,0 +1,19 @@
+package cmd
+
+import (
+	"github.com/rsteube/carapace"
+	"github.com/spf13/cobra"
+)
+
+var betaCmd = &cobra.Command{
+	Use:    "beta",
+	Short:  "Experimental features",
+	Hidden: true,
+	Run:    func(cmd *cobra.Command, args []string) {},
+}
+
+func init() {
+	carapace.Gen(betaCmd).Standalone()
+
+	rootCmd.AddCommand(betaCmd)
+}
diff --git a/completers/fury_completer/cmd/beta_backup.go b/completers/fury_completer/cmd/beta_backup.go
new file mode 100644
index 0000000000..cc00e5d7c1
--- /dev/null
+++ b/completers/fury_completer/cmd/beta_backup.go
@@ -0,0 +1,19 @@
+package cmd
+
+import (
+	"github.com/rsteube/carapace"
+	"github.com/spf13/cobra"
+)
+
+var beta_backupCmd = &cobra.Command{
+	Use:   "backup DIR",
+	Short: "Save all files to a directory",
+	Run:   func(cmd *cobra.Command, args []string) {},
+}
+
+func init() {
+	carapace.Gen(beta_backupCmd).Standalone()
+
+	beta_backupCmd.Flags().String("kind", "", "Filter to one kind of package")
+	betaCmd.AddCommand(beta_backupCmd)
+}
diff --git a/completers/fury_completer/cmd/beta_download.go b/completers/fury_completer/cmd/beta_download.go
new file mode 100644
index 0000000000..7f4764fbff
--- /dev/null
+++ b/completers/fury_completer/cmd/beta_download.go
@@ -0,0 +1,18 @@
+package cmd
+
+import (
+	"github.com/rsteube/carapace"
+	"github.com/spf13/cobra"
+)
+
+var beta_downloadCmd = &cobra.Command{
+	Use:   "download PACKAGE@VERSION",
+	Short: "Download a package to the current directory",
+	Run:   func(cmd *cobra.Command, args []string) {},
+}
+
+func init() {
+	carapace.Gen(beta_downloadCmd).Standalone()
+
+	betaCmd.AddCommand(beta_downloadCmd)
+}
diff --git a/completers/fury_completer/cmd/git.go b/completers/fury_completer/cmd/git.go
index ba27e14dbb..228863b986 100644
--- a/completers/fury_completer/cmd/git.go
+++ b/completers/fury_completer/cmd/git.go
@@ -13,5 +13,6 @@ var gitCmd = &cobra.Command{
 
 func init() {
 	carapace.Gen(gitCmd).Standalone()
+
 	rootCmd.AddCommand(gitCmd)
 }
diff --git a/completers/fury_completer/cmd/git_config.go b/completers/fury_completer/cmd/git_config.go
index 5f6cd763d9..e67c24d76c 100644
--- a/completers/fury_completer/cmd/git_config.go
+++ b/completers/fury_completer/cmd/git_config.go
@@ -6,12 +6,13 @@ import (
 )
 
 var git_configCmd = &cobra.Command{
-	Use:   "config",
+	Use:   "config REPO",
 	Short: "Configure Git build",
 	Run:   func(cmd *cobra.Command, args []string) {},
 }
 
 func init() {
 	carapace.Gen(git_configCmd).Standalone()
+
 	gitCmd.AddCommand(git_configCmd)
 }
diff --git a/completers/fury_completer/cmd/git_config_get.go b/completers/fury_completer/cmd/git_config_get.go
index 66e2ae2d0c..da0154347e 100644
--- a/completers/fury_completer/cmd/git_config_get.go
+++ b/completers/fury_completer/cmd/git_config_get.go
@@ -6,12 +6,13 @@ import (
 )
 
 var git_config_getCmd = &cobra.Command{
-	Use:   "get",
+	Use:   "get REPO KEY",
 	Short: "Get Git build environment key",
 	Run:   func(cmd *cobra.Command, args []string) {},
 }
 
 func init() {
 	carapace.Gen(git_config_getCmd).Standalone()
+
 	git_configCmd.AddCommand(git_config_getCmd)
 }
diff --git a/completers/fury_completer/cmd/git_config_set.go b/completers/fury_completer/cmd/git_config_set.go
index 85cabc119a..05f6f49982 100644
--- a/completers/fury_completer/cmd/git_config_set.go
+++ b/completers/fury_completer/cmd/git_config_set.go
@@ -6,12 +6,13 @@ import (
 )
 
 var git_config_setCmd = &cobra.Command{
-	Use:   "set",
+	Use:   "set REPO KEY=VAL",
 	Short: "Set Git build environment key",
 	Run:   func(cmd *cobra.Command, args []string) {},
 }
 
 func init() {
 	carapace.Gen(git_config_setCmd).Standalone()
+
 	git_configCmd.AddCommand(git_config_setCmd)
 }
diff --git a/completers/fury_completer/cmd/git_config_unset.go b/completers/fury_completer/cmd/git_config_unset.go
index d8d05746ee..a54de75a5c 100644
--- a/completers/fury_completer/cmd/git_config_unset.go
+++ b/completers/fury_completer/cmd/git_config_unset.go
@@ -6,12 +6,13 @@ import (
 )
 
 var git_config_unsetCmd = &cobra.Command{
-	Use:   "unset",
+	Use:   "unset REPO KEY",
 	Short: "Remove Git build environment key",
 	Run:   func(cmd *cobra.Command, args []string) {},
 }
 
 func init() {
 	carapace.Gen(git_config_unsetCmd).Standalone()
+
 	git_configCmd.AddCommand(git_config_unsetCmd)
 }
diff --git a/completers/fury_completer/cmd/git_destroy.go b/completers/fury_completer/cmd/git_destroy.go
index 248e2df6fa..944323e370 100644
--- a/completers/fury_completer/cmd/git_destroy.go
+++ b/completers/fury_completer/cmd/git_destroy.go
@@ -6,7 +6,7 @@ import (
 )
 
 var git_destroyCmd = &cobra.Command{
-	Use:     "destroy",
+	Use:     "destroy REPO",
 	Short:   "Remove Git repository",
 	Aliases: []string{"reset"},
 	Run:     func(cmd *cobra.Command, args []string) {},
@@ -14,6 +14,7 @@ var git_destroyCmd = &cobra.Command{
 
 func init() {
 	carapace.Gen(git_destroyCmd).Standalone()
+
 	git_destroyCmd.Flags().Bool("reset-only", false, "Reset repo without destroying")
 	gitCmd.AddCommand(git_destroyCmd)
 }
diff --git a/completers/fury_completer/cmd/git_list.go b/completers/fury_completer/cmd/git_list.go
index 81da2c4df8..d5f29fe3ce 100644
--- a/completers/fury_completer/cmd/git_list.go
+++ b/completers/fury_completer/cmd/git_list.go
@@ -13,5 +13,6 @@ var git_listCmd = &cobra.Command{
 
 func init() {
 	carapace.Gen(git_listCmd).Standalone()
+
 	gitCmd.AddCommand(git_listCmd)
 }
diff --git a/completers/fury_completer/cmd/git_rebuild.go b/completers/fury_completer/cmd/git_rebuild.go
index bdad4faf2a..1321f79a18 100644
--- a/completers/fury_completer/cmd/git_rebuild.go
+++ b/completers/fury_completer/cmd/git_rebuild.go
@@ -6,13 +6,14 @@ import (
 )
 
 var git_rebuildCmd = &cobra.Command{
-	Use:   "rebuild",
+	Use:   "rebuild REPO",
 	Short: "Run the builder on the repo",
 	Run:   func(cmd *cobra.Command, args []string) {},
 }
 
 func init() {
 	carapace.Gen(git_rebuildCmd).Standalone()
+
 	git_rebuildCmd.Flags().StringP("revision", "r", "", "Revision")
 	gitCmd.AddCommand(git_rebuildCmd)
 }
diff --git a/completers/fury_completer/cmd/git_rename.go b/completers/fury_completer/cmd/git_rename.go
index 76b61f3e6f..4e962f82ea 100644
--- a/completers/fury_completer/cmd/git_rename.go
+++ b/completers/fury_completer/cmd/git_rename.go
@@ -6,12 +6,13 @@ import (
 )
 
 var git_renameCmd = &cobra.Command{
-	Use:   "rename",
+	Use:   "rename REPO NEWNAME",
 	Short: "Rename a Git repository",
 	Run:   func(cmd *cobra.Command, args []string) {},
 }
 
 func init() {
 	carapace.Gen(git_renameCmd).Standalone()
+
 	gitCmd.AddCommand(git_renameCmd)
 }
diff --git a/completers/fury_completer/cmd/git_stack.go b/completers/fury_completer/cmd/git_stack.go
new file mode 100644
index 0000000000..797a39c741
--- /dev/null
+++ b/completers/fury_completer/cmd/git_stack.go
@@ -0,0 +1,18 @@
+package cmd
+
+import (
+	"github.com/rsteube/carapace"
+	"github.com/spf13/cobra"
+)
+
+var git_stackCmd = &cobra.Command{
+	Use:   "stack REPO",
+	Short: "Configure Git stack",
+	Run:   func(cmd *cobra.Command, args []string) {},
+}
+
+func init() {
+	carapace.Gen(git_stackCmd).Standalone()
+
+	gitCmd.AddCommand(git_stackCmd)
+}
diff --git a/completers/fury_completer/cmd/git_stack_set.go b/completers/fury_completer/cmd/git_stack_set.go
new file mode 100644
index 0000000000..e6a8d8e810
--- /dev/null
+++ b/completers/fury_completer/cmd/git_stack_set.go
@@ -0,0 +1,18 @@
+package cmd
+
+import (
+	"github.com/rsteube/carapace"
+	"github.com/spf13/cobra"
+)
+
+var git_stack_setCmd = &cobra.Command{
+	Use:   "set REPO STACK",
+	Short: "Set Git stack for repo",
+	Run:   func(cmd *cobra.Command, args []string) {},
+}
+
+func init() {
+	carapace.Gen(git_stack_setCmd).Standalone()
+
+	git_stackCmd.AddCommand(git_stack_setCmd)
+}
diff --git a/completers/fury_completer/cmd/help.go b/completers/fury_completer/cmd/help.go
index f55758d2d7..c742c862b0 100644
--- a/completers/fury_completer/cmd/help.go
+++ b/completers/fury_completer/cmd/help.go
@@ -6,12 +6,13 @@ import (
 )
 
 var helpCmd = &cobra.Command{
-	Use:   "help",
+	Use:   "help [command]",
 	Short: "Help about any command",
 	Run:   func(cmd *cobra.Command, args []string) {},
 }
 
 func init() {
 	carapace.Gen(helpCmd).Standalone()
+
 	rootCmd.AddCommand(helpCmd)
 }
diff --git a/completers/fury_completer/cmd/login.go b/completers/fury_completer/cmd/login.go
index 854bc8b740..eb83033046 100644
--- a/completers/fury_completer/cmd/login.go
+++ b/completers/fury_completer/cmd/login.go
@@ -13,5 +13,6 @@ var loginCmd = &cobra.Command{
 
 func init() {
 	carapace.Gen(loginCmd).Standalone()
+
 	rootCmd.AddCommand(loginCmd)
 }
diff --git a/completers/fury_completer/cmd/logout.go b/completers/fury_completer/cmd/logout.go
index 9479e34399..d6da638d31 100644
--- a/completers/fury_completer/cmd/logout.go
+++ b/completers/fury_completer/cmd/logout.go
@@ -13,5 +13,6 @@ var logoutCmd = &cobra.Command{
 
 func init() {
 	carapace.Gen(logoutCmd).Standalone()
+
 	rootCmd.AddCommand(logoutCmd)
 }
diff --git a/completers/fury_completer/cmd/packages.go b/completers/fury_completer/cmd/packages.go
index c1a3b42a95..852d447bd5 100644
--- a/completers/fury_completer/cmd/packages.go
+++ b/completers/fury_completer/cmd/packages.go
@@ -14,5 +14,6 @@ var packagesCmd = &cobra.Command{
 
 func init() {
 	carapace.Gen(packagesCmd).Standalone()
+
 	rootCmd.AddCommand(packagesCmd)
 }
diff --git a/completers/fury_completer/cmd/push.go b/completers/fury_completer/cmd/push.go
index 224f05f093..fac66a1bdf 100644
--- a/completers/fury_completer/cmd/push.go
+++ b/completers/fury_completer/cmd/push.go
@@ -6,13 +6,14 @@ import (
 )
 
 var pushCmd = &cobra.Command{
-	Use:   "push",
+	Use:   "push PACKAGE",
 	Short: "Upload a new version of a package",
 	Run:   func(cmd *cobra.Command, args []string) {},
 }
 
 func init() {
 	carapace.Gen(pushCmd).Standalone()
+
 	pushCmd.Flags().Bool("public", false, "Create as public package")
 	pushCmd.Flags().Bool("quiet", false, "Do not show progress bar")
 	rootCmd.AddCommand(pushCmd)
diff --git a/completers/fury_completer/cmd/root.go b/completers/fury_completer/cmd/root.go
index bee3466767..1f26b566b8 100644
--- a/completers/fury_completer/cmd/root.go
+++ b/completers/fury_completer/cmd/root.go
@@ -17,6 +17,7 @@ func Execute() error {
 
 func init() {
 	carapace.Gen(rootCmd).Standalone()
+
 	rootCmd.PersistentFlags().StringP("account", "a", "", "Current account username")
 	rootCmd.PersistentFlags().String("api-token", "", "Inline authentication token")
 	rootCmd.Flags().BoolP("help", "h", false, "help for fury")
diff --git a/completers/fury_completer/cmd/sharing.go b/completers/fury_completer/cmd/sharing.go
index 6108339002..d23c34dee5 100644
--- a/completers/fury_completer/cmd/sharing.go
+++ b/completers/fury_completer/cmd/sharing.go
@@ -13,5 +13,6 @@ var sharingCmd = &cobra.Command{
 
 func init() {
 	carapace.Gen(sharingCmd).Standalone()
+
 	rootCmd.AddCommand(sharingCmd)
 }
diff --git a/completers/fury_completer/cmd/sharing_add.go b/completers/fury_completer/cmd/sharing_add.go
index 4bce37bce3..d18f33bb59 100644
--- a/completers/fury_completer/cmd/sharing_add.go
+++ b/completers/fury_completer/cmd/sharing_add.go
@@ -6,13 +6,14 @@ import (
 )
 
 var sharing_addCmd = &cobra.Command{
-	Use:   "add",
+	Use:   "add EMAIL",
 	Short: "Add a collaborator",
 	Run:   func(cmd *cobra.Command, args []string) {},
 }
 
 func init() {
 	carapace.Gen(sharing_addCmd).Standalone()
+
 	sharing_addCmd.Flags().String("role", "", "Collaborator role")
 	sharingCmd.AddCommand(sharing_addCmd)
 }
diff --git a/completers/fury_completer/cmd/sharing_remove.go b/completers/fury_completer/cmd/sharing_remove.go
index abcc8d81e3..0c6eee5818 100644
--- a/completers/fury_completer/cmd/sharing_remove.go
+++ b/completers/fury_completer/cmd/sharing_remove.go
@@ -6,12 +6,13 @@ import (
 )
 
 var sharing_removeCmd = &cobra.Command{
-	Use:   "remove",
+	Use:   "remove EMAIL",
 	Short: "Remove a collaborator",
 	Run:   func(cmd *cobra.Command, args []string) {},
 }
 
 func init() {
 	carapace.Gen(sharing_removeCmd).Standalone()
+
 	sharingCmd.AddCommand(sharing_removeCmd)
 }
diff --git a/completers/fury_completer/cmd/versions.go b/completers/fury_completer/cmd/versions.go
index 228cfc03f0..8a15eb8c5f 100644
--- a/completers/fury_completer/cmd/versions.go
+++ b/completers/fury_completer/cmd/versions.go
@@ -6,12 +6,13 @@ import (
 )
 
 var versionsCmd = &cobra.Command{
-	Use:   "versions",
+	Use:   "versions PACKAGE",
 	Short: "List versions for a package",
 	Run:   func(cmd *cobra.Command, args []string) {},
 }
 
 func init() {
 	carapace.Gen(versionsCmd).Standalone()
+
 	rootCmd.AddCommand(versionsCmd)
 }
diff --git a/completers/fury_completer/cmd/whoami.go b/completers/fury_completer/cmd/whoami.go
index 2b5b4118fc..afcdaee4be 100644
--- a/completers/fury_completer/cmd/whoami.go
+++ b/completers/fury_completer/cmd/whoami.go
@@ -13,5 +13,6 @@ var whoamiCmd = &cobra.Command{
 
 func init() {
 	carapace.Gen(whoamiCmd).Standalone()
+
 	rootCmd.AddCommand(whoamiCmd)
 }
diff --git a/completers/fury_completer/cmd/yank.go b/completers/fury_completer/cmd/yank.go
index 32cd8f9432..e53d344154 100644
--- a/completers/fury_completer/cmd/yank.go
+++ b/completers/fury_completer/cmd/yank.go
@@ -6,13 +6,14 @@ import (
 )
 
 var yankCmd = &cobra.Command{
-	Use:   "yank",
+	Use:   "yank PACKAGE@VERSION",
 	Short: "Remove a package version",
 	Run:   func(cmd *cobra.Command, args []string) {},
 }
 
 func init() {
 	carapace.Gen(yankCmd).Standalone()
+
 	yankCmd.Flags().StringP("version", "v", "", "Version")
 	rootCmd.AddCommand(yankCmd)
 }