remove infection bugs and changed collision algorithm