Tweak and clean up options.