fix churn option parsing
Merge branch 'add_churn_options'