jh: waypoints
jh: fix