Markers handling improved
Samples fixed