Updated README and --help to include the behaviour of new options