modified obstacle avoidance
guard code and obstacle avoidance changes merged; kill/leader code copied across selectors