last set of changes for a cleaner 'run' docs command