object avoidance adjustments (still not 90% complete