some adjustments for option processing