moved options to individual commands