Add teapot and fix collisions