entry markers on map open and close info windows, code cleanup
merge conflict