Undoing errors
Renamed play/ to flock/ without checking if anything was broken before comitting.
Resulting bugs have been tested and fixed.