Engine 2.0: Collision priority + bug fixes