Bug fixes on map + fixed user tracking