WIP
WIP
fixed bad option parsing