wip
fixed the map view and end of this weekend work