torus and other fixes