further zip headers overhaul.