modifications to Marker and fixed scroll related issues