diff --git a/cli/cmd/db.go b/cli/cmd/db.go
index 2c4f059f..8dc45e2e 100644
--- a/cli/cmd/db.go
+++ b/cli/cmd/db.go
@@ -11,28 +11,14 @@ var dbCmd = &cobra.Command{
 	Use:     "db",
 	Version: rootCmd.Version,
 	Aliases: []string{"database"},
-	Short:   "A brief description of your command",
-	Long: `A longer description that spans multiple lines and likely contains examples
-and usage of using your command. For example:
-
-Cobra is a CLI library for Go that empowers applications.
-This application is a tool to generate the needed files
-to quickly create a Cobra application.`,
+	Short:   "Manage a filebrowser database",
+	Long: `This is a CLI tool to ease the management of
+filebrowser database files.`,
 	Run: func(cmd *cobra.Command, args []string) {
-		fmt.Println("db called")
+		fmt.Println("db called. Command not implemented, yet.")
 	},
 }
 
 func init() {
 	rootCmd.AddCommand(dbCmd)
-
-	// Here you will define your flags and configuration settings.
-
-	// Cobra supports Persistent Flags which will work for this command
-	// and all subcommands, e.g.:
-	// dbCmd.PersistentFlags().String("foo", "", "A help for foo")
-
-	// Cobra supports local flags which will only run when this command
-	// is called directly, e.g.:
-	// dbCmd.Flags().BoolP("toggle", "t", false, "Help message for toggle")
 }
diff --git a/cli/cmd/root.go b/cli/cmd/root.go
index f8db1102..b1037c43 100644
--- a/cli/cmd/root.go
+++ b/cli/cmd/root.go
@@ -17,8 +17,13 @@ var rootCmd = &cobra.Command{
 	Version: "(untracked)",
 	Aliases: []string{"serve"},
 	Short:   "A stylish web-based file manager",
-	Long: `File Browser is static binary composed of a golang backend
-and a Vue.js frontend to create, edit, copy, move, download your files
+	Long: `Command 'serve' is the default. Filebrowser is started
+with the provided envvars, flags and/or config file. For example:
+
+filebrowser -c config.json -p 80 -s ./srv
+
+File Browser is a static binary composed of a golang backend and
+a Vue.js frontend to create, edit, copy, move, download your files
 easily, everywhere, every time.`,
 	//	Run: func(cmd *cobra.Command, args []string) {},
 }
diff --git a/cli/cmd/serve.go b/cli/cmd/serve.go
index be7987e3..6b626883 100644
--- a/cli/cmd/serve.go
+++ b/cli/cmd/serve.go
@@ -11,13 +11,8 @@ var serveCmd = &cobra.Command{
 	Use:     "serve",
 	Version: rootCmd.Version,
 	Aliases: []string{"server"},
-	Short:   "A brief description of your command",
-	Long: `A longer description that spans multiple lines and likely contains examples
-and usage of using your command. For example:
-
-Cobra is a CLI library for Go that empowers applications.
-This application is a tool to generate the needed files
-to quickly create a Cobra application.`,
+	Short:   "Start filebrowser service",
+	Long:    rootCmd.Long,
 	Run: func(cmd *cobra.Command, args []string) {
 		Serve()
 	},