fixed the weird race condition, by using more std stuff in comparators
improved the flocking behaviour a bit