Maybe fix some juddering - unsure
Simplify end-of-path runner logic