make new optionset work. plus re-indent...