Added a bunch more command line options
Some bug fixes regarding run_command