some tweaks to flock'ish