Added logging
Fixed deep path issue on return zip