Added help option
Added dry-run option
Some tuning and fixing