Add ChokePointFinder
Correct ChokePointFinder behaviour for more points