- Regression test fixes.
- Batch improvement on options.