Correct and add some options.