change to OSM, refactor clicks