Re-wrote all command usage and added short+long options for all arguments