Fix subcommand matching and usage help