Removed pipe2eval that I don't use and added a bunch of mappings.