Minor tuning of options.