fixed selection mechanism, updated path point selection