Merge options in the correct order.

Includes some minor documentation tweaks.
2 files changed