Revamp of command-line handling. Most command line options should