Marker description update, many improvements