-o and -s options fixed