A little more option tweaking.