option parsing improved