Collision avoidance improved, separation between entities implemented. Still lots of tweaking required though.