updated collision, tracking and general balancing