new version tons of updates
-o and -s options fixed