change some mappings, add one for split