numerous mapping fixes