preparing for mapping fixes

a bunch of minor changes