Making unzip work
More changes