Added a few more options to the cli.