Better marker placement and performance changes