Changes from last code review, not including refactor of file system archive algorithm changes.