fixing bugs

map size, current location errors (though not all...), etc...