Addes support for Torus and some minor updates
Another support for Torus and minor upgrades