re-work cli args

Signed-off-by: Adam Stokes <adam.stokes@ubuntu.com>
fix command arguments

Signed-off-by: Adam Stokes <adam.stokes@ubuntu.com>