Some changes and additions to zipper and zipper-related things...