Adds map_merger and fixes to mapper