Added Torus. Fixed some transform issues