Overhaul of options file.