Bug fixes and update location based on mouse clicks on map