Minor changes
updated archive handling