FIX: Speed control of critters
Resolved merge conflicts