minor options reorganization