Better option parsing
tweaks