Added better error messages for failures and fixes a cleanup bug.
Added explicit unpacker selections.