Optimized and improved zip extracting + minor improvements