diff --git a/src/client/commands/check_auth.rs b/src/client/commands/check_auth.rs
index b5a7f3e..7729042 100644
--- a/src/client/commands/check_auth.rs
+++ b/src/client/commands/check_auth.rs
@@ -14,11 +14,11 @@ use tokio_stream::StreamExt;
 
 #[derive(Parser, Debug, Clone)]
 pub struct CheckAuthArgs {
-    /// The name of the database(s) or user(s) to check authorization for
+    /// The MySQL database(s) or user(s) to check authorization for
     #[arg(num_args = 1..)]
     name: Vec<String>,
 
-    /// Assume the names are users, not databases
+    /// Treat the provided names as users instead of databases
     #[arg(short, long)]
     users: bool,
 
diff --git a/src/client/commands/create_db.rs b/src/client/commands/create_db.rs
index b88044a..9b64b20 100644
--- a/src/client/commands/create_db.rs
+++ b/src/client/commands/create_db.rs
@@ -15,7 +15,7 @@ use crate::{
 
 #[derive(Parser, Debug, Clone)]
 pub struct CreateDbArgs {
-    /// The name of the database(s) to create
+    /// The MySQL database(s) to create
     #[arg(num_args = 1..)]
     name: Vec<MySQLDatabase>,
 
diff --git a/src/client/commands/create_user.rs b/src/client/commands/create_user.rs
index 5aa3aaf..2883891 100644
--- a/src/client/commands/create_user.rs
+++ b/src/client/commands/create_user.rs
@@ -16,6 +16,7 @@ use crate::{
 
 #[derive(Parser, Debug, Clone)]
 pub struct CreateUserArgs {
+    /// The MySQL user(s) to create
     #[arg(num_args = 1..)]
     username: Vec<MySQLUser>,
 
diff --git a/src/client/commands/drop_db.rs b/src/client/commands/drop_db.rs
index f9a929f..ae64afc 100644
--- a/src/client/commands/drop_db.rs
+++ b/src/client/commands/drop_db.rs
@@ -15,7 +15,7 @@ use crate::{
 
 #[derive(Parser, Debug, Clone)]
 pub struct DropDbArgs {
-    /// The name of the database(s) to drop
+    /// The MySQL database(s) to drop
     #[arg(num_args = 1..)]
     name: Vec<MySQLDatabase>,
 
diff --git a/src/client/commands/drop_user.rs b/src/client/commands/drop_user.rs
index 745b9ef..00e988d 100644
--- a/src/client/commands/drop_user.rs
+++ b/src/client/commands/drop_user.rs
@@ -15,6 +15,7 @@ use crate::{
 
 #[derive(Parser, Debug, Clone)]
 pub struct DropUserArgs {
+    /// The MySQL user(s) to drop
     #[arg(num_args = 1..)]
     username: Vec<MySQLUser>,
 
diff --git a/src/client/commands/edit_privs.rs b/src/client/commands/edit_privs.rs
index 1245960..3c5589b 100644
--- a/src/client/commands/edit_privs.rs
+++ b/src/client/commands/edit_privs.rs
@@ -26,7 +26,7 @@ use crate::{
 
 #[derive(Parser, Debug, Clone)]
 pub struct EditPrivsArgs {
-    /// The name of the database to edit privileges for
+    /// The MySQL database to edit privileges for
     pub name: Option<MySQLDatabase>,
 
     #[arg(
diff --git a/src/client/commands/lock_user.rs b/src/client/commands/lock_user.rs
index 86258af..50b5407 100644
--- a/src/client/commands/lock_user.rs
+++ b/src/client/commands/lock_user.rs
@@ -15,6 +15,7 @@ use crate::{
 
 #[derive(Parser, Debug, Clone)]
 pub struct LockUserArgs {
+    /// The MySQL user(s) to lock
     #[arg(num_args = 1..)]
     username: Vec<MySQLUser>,
 
diff --git a/src/client/commands/passwd_user.rs b/src/client/commands/passwd_user.rs
index be99df2..b980152 100644
--- a/src/client/commands/passwd_user.rs
+++ b/src/client/commands/passwd_user.rs
@@ -17,9 +17,11 @@ use crate::{
 
 #[derive(Parser, Debug, Clone)]
 pub struct PasswdUserArgs {
+    /// The MySQL user whose password is to be changed
     username: MySQLUser,
 
-    #[clap(short, long)]
+    /// Read the new password from a file instead of prompting for it
+    #[clap(short, long, value_name = "FILE")]
     password_file: Option<String>,
 
     /// Print the information as JSON
diff --git a/src/client/commands/show_db.rs b/src/client/commands/show_db.rs
index 0b80a9a..eb7f87a 100644
--- a/src/client/commands/show_db.rs
+++ b/src/client/commands/show_db.rs
@@ -13,7 +13,7 @@ use crate::{
 
 #[derive(Parser, Debug, Clone)]
 pub struct ShowDbArgs {
-    /// The name of the database(s) to show
+    /// The MySQL database(s) to show
     #[arg(num_args = 0..)]
     name: Vec<MySQLDatabase>,
 
diff --git a/src/client/commands/show_privs.rs b/src/client/commands/show_privs.rs
index 6450687..36c748b 100644
--- a/src/client/commands/show_privs.rs
+++ b/src/client/commands/show_privs.rs
@@ -15,7 +15,7 @@ use crate::{
 
 #[derive(Parser, Debug, Clone)]
 pub struct ShowPrivsArgs {
-    /// The name of the database(s) to show
+    /// The MySQL database(s) to show privileges for
     #[arg(num_args = 0..)]
     name: Vec<MySQLDatabase>,
 
diff --git a/src/client/commands/show_user.rs b/src/client/commands/show_user.rs
index a413c79..e9649af 100644
--- a/src/client/commands/show_user.rs
+++ b/src/client/commands/show_user.rs
@@ -13,6 +13,7 @@ use crate::{
 
 #[derive(Parser, Debug, Clone)]
 pub struct ShowUserArgs {
+    /// The MySQL user(s) to show
     #[arg(num_args = 0..)]
     username: Vec<MySQLUser>,
 
diff --git a/src/client/commands/unlock_user.rs b/src/client/commands/unlock_user.rs
index d280a6f..d5a6da3 100644
--- a/src/client/commands/unlock_user.rs
+++ b/src/client/commands/unlock_user.rs
@@ -15,6 +15,7 @@ use crate::{
 
 #[derive(Parser, Debug, Clone)]
 pub struct UnlockUserArgs {
+    /// The MySQL user(s) to unlock
     #[arg(num_args = 1..)]
     username: Vec<MySQLUser>,