adding the base_options and removing duplicate options / functions

Because there were also some problems with displaying help on this command, I thought it would be best to cleanup the code and include the base options so that duplicated options and functions could be removed. And this is fixing the --help output also of course...