slightly improved filearchiver codebase