current Marker bug fixes