updates to usage, command structure