Changed collision envelope, back to 2mm (a bit large, but with the new C::E it works anyway - previously gave strange results if not close to zero, but zero envelope meant bvery small timestep needed)