Update notes for submitted changes

* options: consolidate options definitions