Added "-P", "-d", and --just-read options.