more tweaks about unpacking