many updates to 2d mapper