did some refactoring + added markers for OSM