Changed the zip functions to use objects rather than arrays to reduce overhead.
Fixed error due to 'performance increase'.