diff --git a/README.md b/README.md
index 0ef2d57ce..56ccf823d 100644
--- a/README.md
+++ b/README.md
@@ -51,7 +51,19 @@ $ make
 
 ```
 $ ./build/target/linux/amd64/cli diagnostic
-# some output
+
+Please enter your CircleCI API token:
+OK.
+Your configuration has been created in `/home/zzak/.circleci/cli.yml`.
+It can edited manually for advanced settings.
+
+---
+CircleCI CLI Diagnostics
+---
+
+Config found: `/home/zzak/.circleci/cli.yml`
+Host is: https://circleci.com
+OK, got a token.
 ```
 
 ## Known Issues
diff --git a/cmd/diagnostic.go b/cmd/diagnostic.go
index fba967c81..97def2c99 100644
--- a/cmd/diagnostic.go
+++ b/cmd/diagnostic.go
@@ -17,7 +17,7 @@ func diagnostic(cmd *cobra.Command, args []string) {
 	host := viper.GetString("host")
 	token := viper.GetString("token")
 
-	fmt.Printf("---\nCircleCI CLI Diagnostics\n---\n")
+	fmt.Printf("\n---\nCircleCI CLI Diagnostics\n---\n\n")
 	fmt.Printf("Config found: `%v`\n", viper.ConfigFileUsed())
 
 	if host == "host" || host == "" {
diff --git a/cmd/root.go b/cmd/root.go
index d7ce80a08..3d99a64f2 100644
--- a/cmd/root.go
+++ b/cmd/root.go
@@ -38,7 +38,7 @@ func Execute() {
 func init() {
 	cobra.OnInitialize(initConfig)
 
-	RootCmd.PersistentFlags().StringVar(&cfgFile, "config", "", "config file (default is $HOME/.circleci/cli.yml)")
+	RootCmd.PersistentFlags().StringVarP(&cfgFile, "config", "c", "", "config file (default is $HOME/.circleci/cli.yml)")
 	RootCmd.PersistentFlags().StringP("host", "H", "https://circleci.com", "the host of your CircleCI install")
 	RootCmd.PersistentFlags().StringP("token", "t", "", "your token for using CircleCI")