fix/improve zip behavior