Small update, handle zip files better, and also work!