Fixing map stuff
Passing values with map clicks