Add more entities; fix chasing issues