Fixed "bad" zip call
Minor changes