consolidate options and add some new ones