Fixed comments and removed zip_original.
Fix issues with shift operator.