change: improve options parsing