Redo options and option descriptions for oss