refactorings
wip
shortestRoute: update to M6b