Fix collision of spheres. Cleanups.