Remove tab
Change order of --help option
Add new switches