Command now recognizes help option; CLI opts now standardized.
Refactoring and adding error checking