Some refactoring, argument -D added, -F removed, Help message edited