Clean up command-line arguments, and update help doc and website.