big fixes for zipper