Add Box and Torus
Fix torus