simplified logic for when to fly off the track
annotated original values for tunable parameters
removed TODOs
removed allocation from inner loop