Fixes and map

fixed map, scrolling on map