Added handling of partial archives, better extension matching