diff --git a/argos/commands.py b/argos/commands.py
index 691edde..e9e3e51 100644
--- a/argos/commands.py
+++ b/argos/commands.py
@@ -90,7 +90,8 @@ def agent(server_url, auth, max_tasks, wait_time, log_level):
 @click.option(
     "--config",
     default="config.yaml",
-    help="Path the the configuration file",
+    help="Path of the configuration file. "
+    "If ARGOS_YAML_FILE environment variable is set, its value will be used instead.",
     envvar="ARGOS_YAML_FILE",
 )
 @click.option("--reload", is_flag=True, help="Enable hot reloading")
@@ -132,7 +133,8 @@ def validate_max_results(ctx, param, value):
 @click.option(
     "--config",
     default="config.yaml",
-    help="Path the the configuration file",
+    help="Path of the configuration file. "
+    "If ARGOS_YAML_FILE environment variable is set, its value will be used instead.",
     envvar="ARGOS_YAML_FILE",
 )
 @coroutine
@@ -156,16 +158,17 @@ async def cleandb(max_results, max_lock_seconds, config):
     click.echo(f"{updated} locks released")
 
 
-@server.command()
+@server.command(short_help="Load or reload tasks’ configuration")
 @click.option(
     "--config",
     default="config.yaml",
-    help="Path the the configuration file",
+    help="Path of the configuration file. "
+    "If ARGOS_YAML_FILE environment variable is set, its value will be used instead.",
     envvar="ARGOS_YAML_FILE",
 )
 @coroutine
 async def reload_config(config):
-    """Read tasks configuration and add/delete tasks in database if needed"""
+    """Read tasks’ configuration and add/delete tasks in database if needed"""
     # The imports are made here otherwise the agent will need server configuration files.
     from argos.server import queries
     from argos.server.main import get_application, read_config
@@ -188,7 +191,8 @@ async def reload_config(config):
 @click.option(
     "--config",
     default="config.yaml",
-    help="Path the the configuration file",
+    help="Path of the configuration file. "
+    "If ARGOS_YAML_FILE environment variable is set, its value will be used instead.",
     envvar="ARGOS_YAML_FILE",
 )
 @coroutine
@@ -206,7 +210,7 @@ async def migrate(config):
     command.upgrade(alembic_cfg, "head")
 
 
-@server.command()
+@server.command(short_help="Generate a token for agents")
 @coroutine
 async def generate_token():
     """Generate a token, which can be used as an agent’s authentication token.