minor fixes to swarming model, fixed constants