further cleaned up options in run