added Zip and fixed bugs