Better handling of stray points

Now ignores stray points when trying to expand the paths