more updates and BC breaks for the mapper, but worth it