Map still not working right
map fixes