* improved tuple mapping
+ added zip_map