Backport of Minor fixes
     Fixed problem with -i, would only add one file now can add dir
     had to do a buch of crap with zip to add dirs
     fixed versioning of source file, ie. 002.6
    (cherry picked from commit b9a9ca3278b7065b01deaf429bde363cb9d9ecba)