Updated to match crichton options-source branch changes

 (and fixed a few items in the descriptor file)