More features to 's' command.