final corrections, plus everything in zip