Align options, update doc