Fixed configuration issue and tweaked avoidance component and parameters to make guarding more effective.