Updated so that -s -e options are ignored if -c -p options specify single files.