added max boids to 10000
merge
merge