Some option reording.

Signed-off-by: Repooc <tjcooper1982@gmail.com>