Removed spurious - from command options list.
Fixed bug in _split_command where it improperly handled multi-word commands.