more changes to options initialization