minor: rework object detection
minor: rework fly-by detection