fixed option parsing issues