Boids tweaks

sort out merge conflicts, randomization of size