more mapping and cdm2bag updates