diff --git a/aprsd/cmds/dev.py b/aprsd/cmds/dev.py
index a1d4e77..160aed3 100644
--- a/aprsd/cmds/dev.py
+++ b/aprsd/cmds/dev.py
@@ -17,13 +17,7 @@ LOG = logging.getLogger("APRSD")
 CONTEXT_SETTINGS = dict(help_option_names=["-h", "--help"])
 
 
-@cli.group(help="Development tools", context_settings=CONTEXT_SETTINGS)
-@click.pass_context
-def dev(ctx):
-    pass
-
-
-@dev.command()
+@cli.command()
 @click.option(
     "--aprs-login",
     envvar="APRS_LOGIN",
@@ -65,7 +59,12 @@ def test_plugin(
     number,
     message,
 ):
-    """APRSD Plugin test app."""
+    """Test an APRSD plugin
+
+    This allows you to develop a plugin and send a 'command' string
+    directly to the plugin during development/testing.  Use this before
+    releasing as a plugin for aprsd.
+    """
     config = ctx.obj["config"]
     fromcall = aprs_login
 
diff --git a/aprsd/cmds/send_message.py b/aprsd/cmds/send_message.py
index 569b4bb..9de82c2 100644
--- a/aprsd/cmds/send_message.py
+++ b/aprsd/cmds/send_message.py
@@ -45,8 +45,8 @@ LOG = logging.getLogger("APRSD")
     help="Wait for a response to the message?",
 )
 @click.option("--raw", default=None, help="Send a raw message.  Implies --no-ack")
-@click.argument("tocallsign", required=False)
-@click.argument("command", nargs=-1, required=False)
+@click.argument("tocallsign", required=True)
+@click.argument("command", nargs=-1, required=True)
 @click.pass_context
 def send_message(
     ctx,