Reorganize options to be in same order as usage; add "password" option.