finish fewest hops
Merge branch 'dev' into conor
fix merge conflict