update for review comments; redo archive parsing code