route: gather more close points to be used later
route: a few other changes, not ready...