Incorporate CR feedback, and new learnings about zip file format.