Updated doc and simplified options.