better waypoints detection
merge lg improvments