add mapping code
map fixes