fix map bug
map fix 2
more map tweaking
yet more map tweaking