Added approachMarker
Fixed some problems