Reworked some of the type detection logic, and fixed issue of wrong name when unpacking E00.