Added a number of command line options. Mostly still experimental