Fix up the -s option, and make usage consitent with behaviour,