Updated RotateOrg to account for torus cases. Minor cleanups in torus sensor.