some more flock'ish craziness, moved stuff around