Niko fixed map-markers, made edits to API calling, but left w/ issues